Inform the user which trait is meant in the diagnostic itself instead of relying on the span making it obvious

oli-obk · oli-obk · commit 717294fa04da · 2022-12-13T09:48:26.000Z
diff --git a/compiler/rustc_hir_typeck/src/method/suggest.rs b/compiler/rustc_hir_typeck/src/method/suggest.rs
@@ -1853,7 +1853,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         )],
     ) {
         let mut derives = Vec::<(String, Span, Symbol)>::new();
-        let mut traits = Vec::<Span>::new();
+        let mut traits = Vec::new();
         for (pred, _, _) in unsatisfied_predicates {
             let ty::PredicateKind::Clause(ty::Clause::Trait(trait_pred)) = pred.kind().skip_binder() else { continue };
             let adt = match trait_pred.self_ty().ty_adt_def() {
@@ -1892,10 +1892,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     }
                     derives.push((self_name, self_span, diagnostic_name));
                 } else {
-                    traits.push(self.tcx.def_span(trait_pred.def_id()));
+                    traits.push(trait_pred.def_id());
                 }
             } else {
-                traits.push(self.tcx.def_span(trait_pred.def_id()));
+                traits.push(trait_pred.def_id());
             }
         }
         traits.sort();
@@ -1918,10 +1918,23 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let len = traits.len();
         if len > 0 {
-            let span: MultiSpan = traits.into();
+            let span =
+                MultiSpan::from_spans(traits.iter().map(|&did| self.tcx.def_span(did)).collect());
+            let mut names = format!("`{}`", self.tcx.def_path_str(traits[0]));
+            for (i, &did) in traits.iter().enumerate().skip(1) {
+                if len > 2 {
+                    names.push_str(", ");
+                }
+                if i == len - 1 {
+                    names.push_str(" and ");
+                }
+                names.push('`');
+                names.push_str(&self.tcx.def_path_str(did));
+                names.push('`');
+            }
             err.span_note(
                 span,
-                &format!("the following trait{} must be implemented", pluralize!(len),),
+                &format!("the trait{} {} must be implemented", pluralize!(len), names),
             );
         }
 
diff --git a/src/test/ui/binop/issue-28837.stderr b/src/test/ui/binop/issue-28837.stderr
@@ -11,7 +11,7 @@ note: an implementation of `Add<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: cannot subtract `A` from `A`
@@ -27,7 +27,7 @@ note: an implementation of `Sub<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Sub<_>`
-note: the following trait must be implemented
+note: the trait `Sub` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: cannot multiply `A` by `A`
@@ -43,7 +43,7 @@ note: an implementation of `Mul<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: cannot divide `A` by `A`
@@ -59,7 +59,7 @@ note: an implementation of `Div<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Div<_>`
-note: the following trait must be implemented
+note: the trait `Div` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: cannot mod `A` by `A`
@@ -75,7 +75,7 @@ note: an implementation of `Rem<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Rem<_>`
-note: the following trait must be implemented
+note: the trait `Rem` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: no implementation for `A & A`
@@ -91,7 +91,7 @@ note: an implementation of `BitAnd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitAnd<_>`
-note: the following trait must be implemented
+note: the trait `BitAnd` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error[E0369]: no implementation for `A | A`
@@ -107,7 +107,7 @@ note: an implementation of `BitOr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error[E0369]: no implementation for `A << A`
@@ -123,7 +123,7 @@ note: an implementation of `Shl<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shl<_>`
-note: the following trait must be implemented
+note: the trait `Shl` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error[E0369]: no implementation for `A >> A`
@@ -139,7 +139,7 @@ note: an implementation of `Shr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shr<_>`
-note: the following trait must be implemented
+note: the trait `Shr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error[E0369]: binary operation `==` cannot be applied to type `A`
diff --git a/src/test/ui/binop/issue-3820.stderr b/src/test/ui/binop/issue-3820.stderr
@@ -11,7 +11,7 @@ note: an implementation of `Mul<_>` might be missing for `Thing`
    |
 LL | struct Thing {
    | ^^^^^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error: aborting due to previous error
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.stderr b/src/test/ui/destructuring-assignment/note-unsupported.stderr
@@ -49,7 +49,7 @@ note: an implementation of `AddAssign<_>` might be missing for `S`
    |
 LL | struct S { x: u8, y: u8 }
    | ^^^^^^^^ must implement `AddAssign<_>`
-note: the following trait must be implemented
+note: the trait `AddAssign` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0067]: invalid left-hand side of assignment
diff --git a/src/test/ui/error-festival.stderr b/src/test/ui/error-festival.stderr
@@ -41,7 +41,7 @@ note: an implementation of `Not` might be missing for `Question`
    |
 LL | enum Question {
    | ^^^^^^^^^^^^^ must implement `Not`
-note: the following trait must be implemented
+note: the trait `Not` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error[E0604]: only `u8` can be cast as `char`, not `u32`
diff --git a/src/test/ui/impl-trait/issues/issue-62742.stderr b/src/test/ui/impl-trait/issues/issue-62742.stderr
@@ -25,7 +25,7 @@ LL | pub struct SafeImpl<T: ?Sized, A: Raw<T>>(PhantomData<(A, T)>);
    |
    = note: the following trait bounds were not satisfied:
            `RawImpl<()>: Raw<()>`
-note: the following trait must be implemented
+note: the trait `Raw` must be implemented
   --> $DIR/issue-62742.rs:12:1
    |
 LL | pub trait Raw<T: ?Sized> {
diff --git a/src/test/ui/issues/issue-14091-2.stderr b/src/test/ui/issues/issue-14091-2.stderr
@@ -9,7 +9,7 @@ note: an implementation of `Not` might be missing for `BytePos`
    |
 LL | pub struct BytePos(pub u32);
    | ^^^^^^^^^^^^^^^^^^ must implement `Not`
-note: the following trait must be implemented
+note: the trait `Not` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr
@@ -61,7 +61,7 @@ LL |      .take()
    = note: the following trait bounds were not satisfied:
            `Foo: Iterator`
            which is required by `&mut Foo: Iterator`
-note: the following trait must be implemented
+note: the trait `Iterator` must be implemented
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `take`, perhaps you need to implement it:
diff --git a/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr b/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
@@ -11,7 +11,7 @@ note: an implementation of `AddAssign<_>` might be missing for `Foo`
    |
 LL | struct Foo;
    | ^^^^^^^^^^ must implement `AddAssign<_>`
-note: the following trait must be implemented
+note: the trait `AddAssign` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error: aborting due to previous error
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr b/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
@@ -35,7 +35,7 @@ note: an implementation of `BitOr<_>` might be missing for `E`
    |
 LL | enum E { A, B }
    | ^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr
@@ -26,7 +26,7 @@ note: an implementation of `Add<_>` might be missing for `World`
    |
 LL | enum World {
    | ^^^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0369]: cannot add `String` to `&str`
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
@@ -27,7 +27,7 @@ LL | default impl<T> Foo for T {
    | ^^^^^^^^^^^^^^^^---^^^^^-
    | |
    | unsatisfied trait bound introduced here
-note: the following trait must be implemented
+note: the trait `Foo` must be implemented
   --> $DIR/specialization-trait-not-implemented.rs:7:1
    |
 LL | trait Foo {
diff --git a/src/test/ui/suggestions/derive-trait-for-method-call.stderr b/src/test/ui/suggestions/derive-trait-for-method-call.stderr
@@ -20,7 +20,7 @@ LL |     let y = x.test();
            `Enum: Clone`
            `Enum: Default`
            `CloneEnum: Default`
-note: the following trait must be implemented
+note: the trait `Default` must be implemented
   --> $SRC_DIR/core/src/default.rs:LL:COL
 help: consider annotating `Enum` with `#[derive(Clone)]`
    |
diff --git a/src/test/ui/suggestions/restrict-type-not-param.stderr b/src/test/ui/suggestions/restrict-type-not-param.stderr
@@ -11,7 +11,7 @@ note: an implementation of `Add<_>` might be missing for `Wrapper<T>`
    |
 LL | struct Wrapper<T>(T);
    | ^^^^^^^^^^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement
    |
diff --git a/src/test/ui/type/type-ascription-precedence.stderr b/src/test/ui/type/type-ascription-precedence.stderr
@@ -33,7 +33,7 @@ note: an implementation of `std::ops::Neg` might be missing for `Z`
    |
 LL | struct Z;
    | ^^^^^^^^ must implement `std::ops::Neg`
-note: the following trait must be implemented
+note: the trait `std::ops::Neg` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
 
 error[E0308]: mismatched types

Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ note: an implementation of `Mul<_>` might be missing for `Thing`
`11`	`11`	`\|`
`12`	`12`	`LL \| struct Thing {`
`13`	`13`	\| ^^^^^^^^^^^^ must implement `Mul<_>`
`14`		`-note: the following trait must be implemented`
	`14`	+note: the trait `Mul` must be implemented
`15`	`15`	`--> $SRC_DIR/core/src/ops/arith.rs:LL:COL`
`16`	`16`
`17`	`17`	`error: aborting due to previous error`
Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ note: an implementation of `AddAssign<_>` might be missing for `S`
`49`	`49`	`\|`
`50`	`50`	`LL \| struct S { x: u8, y: u8 }`
`51`	`51`	\| ^^^^^^^^ must implement `AddAssign<_>`
`52`		`-note: the following trait must be implemented`
	`52`	+note: the trait `AddAssign` must be implemented
`53`	`53`	`--> $SRC_DIR/core/src/ops/arith.rs:LL:COL`
`54`	`54`
`55`	`55`	`error[E0067]: invalid left-hand side of assignment`
Original file line number	Diff line number	Diff line change
@@ -41,7 +41,7 @@ note: an implementation of `Not` might be missing for `Question`
`41`	`41`	`\|`
`42`	`42`	`LL \| enum Question {`
`43`	`43`	\| ^^^^^^^^^^^^^ must implement `Not`
`44`		`-note: the following trait must be implemented`
	`44`	+note: the trait `Not` must be implemented
`45`	`45`	`--> $SRC_DIR/core/src/ops/bit.rs:LL:COL`
`46`	`46`
`47`	`47`	error[E0604]: only `u8` can be cast as `char`, not `u32`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ LL \| pub struct SafeImpl<T: ?Sized, A: Raw<T>>(PhantomData<(A, T)>);`
`25`	`25`	`\|`
`26`	`26`	`= note: the following trait bounds were not satisfied:`
`27`	`27`	`RawImpl<()>: Raw<()>`
`28`		`-note: the following trait must be implemented`
	`28`	+note: the trait `Raw` must be implemented
`29`	`29`	`--> $DIR/issue-62742.rs:12:1`
`30`	`30`	`\|`
`31`	`31`	`LL \| pub trait Raw<T: ?Sized> {`
Original file line number	Diff line number	Diff line change
@@ -9,7 +9,7 @@ note: an implementation of `Not` might be missing for `BytePos`
`9`	`9`	`\|`
`10`	`10`	`LL \| pub struct BytePos(pub u32);`
`11`	`11`	\| ^^^^^^^^^^^^^^^^^^ must implement `Not`
`12`		`-note: the following trait must be implemented`
	`12`	+note: the trait `Not` must be implemented
`13`	`13`	`--> $SRC_DIR/core/src/ops/bit.rs:LL:COL`
`14`	`14`	= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
`15`	`15`
Original file line number	Diff line number	Diff line change
@@ -35,7 +35,7 @@ note: an implementation of `BitOr<_>` might be missing for `E`
`35`	`35`	`\|`
`36`	`36`	`LL \| enum E { A, B }`
`37`	`37`	\| ^^^^^^ must implement `BitOr<_>`
`38`		`-note: the following trait must be implemented`
	`38`	+note: the trait `BitOr` must be implemented
`39`	`39`	`--> $SRC_DIR/core/src/ops/bit.rs:LL:COL`
`40`	`40`
`41`	`41`	`error: aborting due to 5 previous errors`