Skip to content

Commit db90c98

Browse files
committed
Auto merge of #156967 - JonathanBrouwer:rollup-cDWgT7T, r=JonathanBrouwer
Rollup of 9 pull requests Successful merges: - rust-lang/rust#156959 (stdarch subtree update) - rust-lang/rust#156541 (delegation: remove method call generation) - rust-lang/rust#156161 (rustc_on_unimplemented: introduce format specifiers) - rust-lang/rust#156752 (fix E0371 description) - rust-lang/rust#156761 (tidy: remove duplicate entry and alphabetize OS constants list) - rust-lang/rust#156872 (Drop skip_move_check_fns query.) - rust-lang/rust#156899 (fix breakpoint callback registration in `lldb_batchmode`) - rust-lang/rust#156927 (Reorganize `tests/ui/issues` [1/N]) - rust-lang/rust#156947 (Update mdbook to 0.5.3)
2 parents 9802416 + dbaedc4 commit db90c98

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/diagnostics.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,12 +1018,13 @@ pub trait From<T>: Sized {
10181018
### Formatting
10191019

10201020
The string literals are format strings that accept parameters wrapped in braces
1021-
but positional and listed parameters and format specifiers are not accepted.
1021+
but positional and listed parameters are not accepted.
10221022
The following parameter names are valid:
10231023
- `Self` and all generic parameters of the trait.
10241024
- `This`: the name of the trait the attribute is on, without generics.
1025-
- `Trait`: the name of the "sugared" trait.
1026-
See `TraitRefPrintSugared`.
1025+
- `This:path`: the full path of the trait the attribute is on, with unresolved generics.
1026+
- `This:resolved`: the full path of the trait the attribute is on, with resolved generics.
1027+
Additionally, this will "sugar" the `Fn(...)` traits.
10271028
- `ItemContext`: the kind of `hir::Node` we're in, things like `"an async block"`,
10281029
`"a function"`, `"an async function"`, etc.
10291030

0 commit comments

Comments
 (0)