Fix tests

Author: aerooneqq

tests/incremental/delegation/impl-reuse-pass.rs

@@ -174,19 +174,6 @@ mod macros {
     macro_rules! m { () => { M } }
     reuse impl Trait for m!() { self_0_ref!(self) }
 
-    struct S1(u8);
-    macro_rules! one_line_reuse { ($self:ident) => { reuse impl Trait for S1 { $self.0 } } }
-    one_line_reuse!(self);
-
-    struct S2(u8);
-    macro_rules! one_line_reuse_expr { ($x:expr) => { reuse impl Trait for S2 { $x } } }
-    one_line_reuse_expr!(self.0);
-
-    struct S3(u8);
-    macro_rules! s3 { () => { S3 } }
-    macro_rules! one_line_reuse_expr2 { ($x:expr) => { reuse impl Trait for s3!() { $x } } }
-    one_line_reuse_expr2!(self.0);
-
     fn f() {
         let s = S(1);
         s.foo();
@@ -195,18 +182,6 @@ mod macros {
         let m = M(41);
         m.foo();
         m.bar();
-
-        let s1 = S1(2);
-        s1.foo();
-        s1.bar();
-
-        let s2 = S2(4);
-        s2.foo();
-        s2.bar();
-
-        let s3 = S3(5);
-        s3.foo();
-        s3.bar();
     }
 }
 

tests/ui/delegation/query-cycle-oom.rs

@@ -22,7 +22,6 @@ mod test_2 {
     trait Trait {
         fn foo() -> Self::Assoc;
         //~^ ERROR: associated type `Assoc` not found for `Self`
-        //~| ERROR: this function takes 0 arguments but 1 argument was supplied
         fn bar(&self) -> u8;
     }
 
@@ -35,20 +34,21 @@ mod test_2 {
 
     impl Trait for S {
         reuse Trait::* { &self.0 }
+        //~^ ERROR: this function takes 0 arguments but 1 argument was supplied
         fn bar(&self) -> u8 { 2 }
     }
 }
 
 mod test_3 {
     trait Trait {
         fn foo(&self) -> Self::Assoc<3> { //~ ERROR: associated type `Assoc` not found for `Self`
-        //~^ ERROR: no method named `foo` found for reference `&()` in the current scope
             [(); 3]
         }
     }
 
     impl () { //~ ERROR: cannot define inherent `impl` for primitive types
         reuse Trait::*;
+        //~^ ERROR: no method named `foo` found for reference `&()` in the current scope
     }
 }
 

tests/ui/delegation/query-cycle-oom.stderr

@@ -49,7 +49,7 @@ LL |     reuse Trait::<_>::foo::<i32> as x;
    |                   ^ not allowed in type signatures
 
 error[E0046]: not all trait items implemented, missing: `foo`
-  --> $DIR/query-cycle-oom.rs:29:5
+  --> $DIR/query-cycle-oom.rs:28:5
    |
 LL |         fn foo() -> Self::Assoc;
    |         ------------------------ `foo` from trait
@@ -58,7 +58,7 @@ LL |     impl Trait for u8 {
    |     ^^^^^^^^^^^^^^^^^ missing `foo` in implementation
 
 error[E0390]: cannot define inherent `impl` for primitive types
-  --> $DIR/query-cycle-oom.rs:50:5
+  --> $DIR/query-cycle-oom.rs:49:5
    |
 LL |     impl () {
    |     ^^^^^^^
@@ -74,13 +74,10 @@ LL |         reuse to_reuse::foo { &self.0 }
    = help: you might be missing a crate named `to_reuse`
 
 error[E0061]: this function takes 0 arguments but 1 argument was supplied
-  --> $DIR/query-cycle-oom.rs:23:12
+  --> $DIR/query-cycle-oom.rs:36:22
    |
-LL |         fn foo() -> Self::Assoc;
-   |            ^^^
-...
 LL |         reuse Trait::* { &self.0 }
-   |                          ------- unexpected argument
+   |                      ^   ------- unexpected argument
    |
 note: associated function defined here
   --> $DIR/query-cycle-oom.rs:23:12
@@ -89,29 +86,15 @@ LL |         fn foo() -> Self::Assoc;
    |            ^^^
 help: remove the extra argument
    |
-LL -         fn foo() -> Self::Assoc;
-LL -
-LL -
-LL -         fn bar(&self) -> u8;
-LL -     }
-LL - 
-LL -     impl Trait for u8 {
-LL -
-LL -         fn bar(&self) -> u8 { 1 }
-LL -     }
-LL - 
-LL -     struct S(u8);
-LL - 
-LL -     impl Trait for S {
 LL -         reuse Trait::* { &self.0 }
-LL +         fn fo&self.0 }
+LL +         reuse Trait::&self.0 }
    |
 
 error[E0599]: no method named `foo` found for reference `&()` in the current scope
-  --> $DIR/query-cycle-oom.rs:44:12
+  --> $DIR/query-cycle-oom.rs:50:22
    |
-LL |         fn foo(&self) -> Self::Assoc<3> {
-   |            ^^^ method not found in `&()`
+LL |         reuse Trait::*;
+   |                      ^ method not found in `&()`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following traits define an item `foo`, perhaps you need to implement one of them: