Fix tests

Author: Zoxc

src/test/compile-fail/issue-20413.rs

@@ -18,6 +18,7 @@ struct NoData<T>;
 impl<T> Foo for T where NoData<T>: Foo {
 //~^ ERROR: overflow evaluating the requirement
   fn answer(self) {
+  //~^ ERROR: overflow evaluating the requirement
     let val: NoData<T> = NoData;
   }
 }

src/test/compile-fail/issue-21946.rs

@@ -17,6 +17,7 @@ struct FooStruct;
 impl Foo for FooStruct {
 //~^ ERROR overflow evaluating the requirement `<FooStruct as Foo>::A`
     type A = <FooStruct as Foo>::A;
+    //~^ ERROR overflow evaluating the requirement `<FooStruct as Foo>::A`
 }
 
 fn main() {}

src/test/compile-fail/issue-23122-1.rs

@@ -17,6 +17,7 @@ struct GetNext<T: Next> { t: T }
 impl<T: Next> Next for GetNext<T> {
     //~^ ERROR overflow evaluating the requirement
     type Next = <GetNext<T> as Next>::Next;
+    //~^ ERROR overflow evaluating the requirement
 }
 
 fn main() {}

src/test/compile-fail/issue-23122-2.rs

@@ -17,6 +17,7 @@ struct GetNext<T: Next> { t: T }
 impl<T: Next> Next for GetNext<T> {
     //~^ ERROR overflow evaluating the requirement
     type Next = <GetNext<T::Next> as Next>::Next;
+    //~^ ERROR overflow evaluating the requirement
 }
 
 fn main() {}

src/test/ui/cycle-trait-supertrait-indirect.stderr

@@ -10,11 +10,6 @@ note: ...which requires computing the supertraits of `C`...
 LL | trait C: B { }
    | ^^^^^^^^^^
    = note: ...which again requires computing the supertraits of `B`, completing the cycle
-note: cycle used when computing the supertraits of `A`
-  --> $DIR/cycle-trait-supertrait-indirect.rs:14:1
-   |
-LL | trait A: B {
-   | ^^^^^^^^^^
 
 error: aborting due to previous error
 

src/test/ui/impl-trait/auto-trait-leak.stderr

@@ -52,7 +52,6 @@ note: ...which requires processing `cycle1::{{impl-Trait}}`...
 LL | fn cycle1() -> impl Clone {
    |                ^^^^^^^^^^
    = note: ...which again requires processing `cycle1`, completing the cycle
-note: cycle used when type-checking all item bodies
 
 error: aborting due to 3 previous errors
 

src/test/ui/span/issue-35987.rs

@@ -17,6 +17,7 @@ impl<T: Clone, Add> Add for Foo<T> {
     type Output = usize;
 
     fn add(self, rhs: Self) -> Self::Output {
+        //~^ ERROR ambiguous associated type
         unimplemented!();
     }
 }

src/test/ui/span/issue-35987.stderr

@@ -8,6 +8,15 @@ help: possible better candidate is found in another module, you can import it in
 LL | use std::ops::Add;
    |
 
-error: aborting due to previous error
+error[E0223]: ambiguous associated type
+  --> $DIR/issue-35987.rs:19:32
+   |
+LL |     fn add(self, rhs: Self) -> Self::Output {
+   |                                ^^^^^^^^^^^^ ambiguous associated type
+   |
+   = note: specify the type using the syntax `<Foo<T> as Trait>::Output`
+
+error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0404`.
+Some errors occurred: E0223, E0404.
+For more information about an error, try `rustc --explain E0223`.