Commit 3962bfa

authored

Rollup merge of #135856 - fmease:library-mv-obj-save-dyn-compat-ii, r=tgross35

Library: Finalize dyn compatibility renaming Update the Reference link to use the new URL fragment from rust-lang/reference#1666 (this change has finally hit stable). Fixes a FIXME. Follow-up to #130827. Part of #130852.

2 parents 0bdc101 + 9e98d25 commit 3962bfaCopy full SHA for 3962bfa

File tree

1 file changed

-5

lines changed

library/std/src
- keyword_docs.rs

1 file changed

-5

lines changed

`‎library/std/src/keyword_docs.rs‎`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2387,13 +2387,12 @@ mod async_keyword {}`
`2387`	`2387`	/// [`async`]: ../std/keyword.async.html
`2388`	`2388`	`mod await_keyword {}`
`2389`	`2389`
`2390`		`-// FIXME(dyn_compat_renaming): Update URL and link text.`
`2391`	`2390`	`#[doc(keyword = "dyn")]`
`2392`	`2391`	`//`
`2393`	`2392`	/// `dyn` is a prefix of a [trait object]'s type.
`2394`	`2393`	`///`
`2395`	`2394`	/// The `dyn` keyword is used to highlight that calls to methods on the associated `Trait`
`2396`		`-/// are [dynamically dispatched]. To use the trait this way, it must be 'dyn-compatible'[^1].`
	`2395`	`+/// are [dynamically dispatched]. To use the trait this way, it must be dyncompatible[^1].`
`2397`	`2396`	`///`
`2398`	`2397`	/// Unlike generic parameters or `impl Trait`, the compiler does not know the concrete type that
`2399`	`2398`	`/// is being passed. That is, the type has been [erased].`
`@@ -2406,7 +2405,7 @@ mod await_keyword {}`
`2406`	`2405`	`/// the function pointer and then that function pointer is called.`
`2407`	`2406`	`///`
`2408`	`2407`	`/// See the Reference for more information on [trait objects][ref-trait-obj]`
`2409`		`-/// and [object safety][ref-obj-safety].`
	`2408`	`+/// and [dyn compatibility][ref-dyn-compat].`
`2410`	`2409`	`///`
`2411`	`2410`	`/// ## Trade-offs`
`2412`	`2411`	`///`
`@@ -2419,9 +2418,9 @@ mod await_keyword {}`
`2419`	`2418`	`/// [trait object]: ../book/ch17-02-trait-objects.html`
`2420`	`2419`	`/// [dynamically dispatched]: https://en.wikipedia.org/wiki/Dynamic_dispatch`
`2421`	`2420`	`/// [ref-trait-obj]: ../reference/types/trait-object.html`
`2422`		`-/// [ref-obj-safety]: ../reference/items/traits.html#object-safety`
	`2421`	`+/// [ref-dyn-compat]: ../reference/items/traits.html#dyn-compatibility`
`2423`	`2422`	`/// [erased]: https://en.wikipedia.org/wiki/Type_erasure`
`2424`		`-/// [^1]: Formerly known as 'object safe'.`
	`2423`	`+/// [^1]: Formerly known as object safe.`
`2425`	`2424`	`mod dyn_keyword {}`
`2426`	`2425`
`2427`	`2426`	`#[doc(keyword = "union")]`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3962bfa

File tree

1 file changed

1 file changed

`‎library/std/src/keyword_docs.rs‎`

0 commit comments