diff options
| author | bors <bors@rust-lang.org> | 2025-04-17 04:52:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-17 04:52:34 +0000 |
| commit | 15c4ccef03116e6a509199e845ad266306a0e9ee (patch) | |
| tree | dc68613f1c15f987b43a5a2bcbb91e1651c7aab3 /compiler/rustc_parse/messages.ftl | |
| parent | 79a272c6402e0ac0aed17c647c4f709479e67a30 (diff) | |
| parent | f8f22add3b874027e7e72c3d025b57e4c465ad33 (diff) | |
| download | rust-15c4ccef03116e6a509199e845ad266306a0e9ee.tar.gz rust-15c4ccef03116e6a509199e845ad266306a0e9ee.zip | |
Auto merge of #139940 - matthiaskrgr:rollup-rd4d3fn, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #135340 (Add `explicit_extern_abis` Feature and Enforce Explicit ABIs) - #139440 (rustc_target: RISC-V: feature addition batch 2) - #139667 (cfi: Remove #[no_sanitize(cfi)] for extern weak functions) - #139828 (Don't require rigid alias's trait to hold) - #139854 (Improve parse errors for stray lifetimes in type position) - #139889 (Clean UI tests 3 of n) - #139894 (Fix `opt-dist` CLI flag and make it work without LLD) - #139900 (stepping into impls for normalization is unproductive) - #139915 (replace some #[rustc_intrinsic] usage with use of the libcore declarations) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/messages.ftl')
| -rw-r--r-- | compiler/rustc_parse/messages.ftl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_parse/messages.ftl b/compiler/rustc_parse/messages.ftl index 5837f5de5ee..e7f17bb6f99 100644 --- a/compiler/rustc_parse/messages.ftl +++ b/compiler/rustc_parse/messages.ftl @@ -543,7 +543,7 @@ parse_maybe_recover_from_bad_qpath_stage_2 = .suggestion = types that don't start with an identifier need to be surrounded with angle brackets in qualified paths parse_maybe_recover_from_bad_type_plus = - expected a path on the left-hand side of `+`, not `{$ty}` + expected a path on the left-hand side of `+` parse_maybe_report_ambiguous_plus = ambiguous `+` in a type @@ -642,7 +642,9 @@ parse_mut_on_nested_ident_pattern = `mut` must be attached to each individual bi .suggestion = add `mut` to each binding parse_mut_on_non_ident_pattern = `mut` must be followed by a named binding .suggestion = remove the `mut` prefix -parse_need_plus_after_trait_object_lifetime = lifetime in trait object type must be followed by `+` + +parse_need_plus_after_trait_object_lifetime = lifetimes must be followed by `+` to form a trait object type + .suggestion = consider adding a trait bound after the potential lifetime bound parse_nested_adt = `{$kw_str}` definition cannot be nested inside `{$keyword}` .suggestion = consider creating a new `{$kw_str}` definition instead of nesting |