Skip to content

Commit 76101ee

Browse files
committedJan 8, 2024
Auto merge of #119722 - matthiaskrgr:rollup-y6w3c9h, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #116129 (Rewrite `pin` module documentation to clarify usage and invariants) - #119703 (Impl trait diagnostic tweaks) - #119705 (Support `~const` in associated functions in trait impls) - #119708 (Unions are not `PointerLike`) - #119711 (Delete unused makefile in tests/ui) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 75c68cf + bf20ade commit 76101ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1499
-597
lines changed
 

Diff for: ‎compiler/rustc_ast_lowering/messages.ftl

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ ast_lowering_misplaced_double_dot =
106106
.note = only allowed in tuple, tuple struct, and slice patterns
107107
108108
ast_lowering_misplaced_impl_trait =
109-
`impl Trait` only allowed in function and inherent method argument and return types, not in {$position}
109+
`impl Trait` is not allowed in {$position}
110+
.note = `impl Trait` is only allowed in arguments and return types of functions and methods
110111
111112
ast_lowering_misplaced_relax_trait_bound =
112113
`?Trait` bounds are only permitted at the point where a type parameter is declared

Diff for: ‎compiler/rustc_ast_lowering/src/errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ pub enum AssocTyParenthesesSub {
9090

9191
#[derive(Diagnostic)]
9292
#[diag(ast_lowering_misplaced_impl_trait, code = "E0562")]
93+
#[note]
9394
pub struct MisplacedImplTrait<'a> {
9495
#[primary_span]
9596
pub span: Span,

0 commit comments

Comments
 (0)