Rollup merge of #35507 - hank-der-hafenarbeiter:master, r=jonathandturner

Updated Error mesage to new format for E0221

Part of #35386
r? @jonathandturner

diff --cc src/librustc_typeck/astconv.rs
Simple merge

diff --cc src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs
index 007f1d3a2947d300e540494a195f1428acd5fdc7,b311683b32e6e71e58d9c4192d2a94ece2aa43fe..a2a11c62bb83245a851c7158f7dea07901bcb2b9
--- 1/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs
--- 2/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs
+++ b/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs
@@@ -35,9 -36,9 +36,10 @@@ fn dent<C:BoxCar>(c: C, color: C::Color
  fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
      //~^ ERROR ambiguous associated type
      //~| ERROR the value of the associated type `Color` (from the trait `Vehicle`) must be specified
+     //~| NOTE ambiguous associated type `Color`
      //~| NOTE could derive from `Vehicle`
      //~| NOTE could derive from `Box`
 +    //~| NOTE missing associated type `Color` value
  }
  
  fn paint<C:BoxCar>(c: C, d: C::Color) {