Update some tests after rebase

Author: petrochenkov

tests/ui/delegation/glob-glob-conflict.rs

@@ -3,13 +3,10 @@
 
 trait Trait1 {
     fn method(&self) -> u8;
-    //~^ ERROR: this function takes 1 argument but 0 arguments were supplied
-    //~| ERROR: mismatched types
 }
 trait Trait2 {
     fn method(&self) -> u8;
-    //~^ ERROR: this function takes 1 argument but 0 arguments were supplied
-    //~| ERROR: mismatched types
+
 }
 trait Trait {
     fn method(&self) -> u8;
@@ -28,10 +25,14 @@ impl Trait2 for u8 {
 impl Trait for u8 {
     reuse Trait1::*;
     reuse Trait2::*; //~ ERROR duplicate definitions with name `method`
+    //~^ ERROR: this function takes 1 argument but 0 arguments were supplied
+    //~| ERROR: mismatched types
 }
 impl Trait for u16 {
     reuse Trait1::*;
     reuse Trait1::*; //~ ERROR duplicate definitions with name `method`
+    //~^ ERROR: this function takes 1 argument but 0 arguments were supplied
+    //~| ERROR: mismatched types
 }
 
 fn main() {}

tests/ui/delegation/glob-glob-conflict.stderr

@@ -1,5 +1,5 @@
 error[E0201]: duplicate definitions with name `method`:
-  --> $DIR/glob-glob-conflict.rs:30:5
+  --> $DIR/glob-glob-conflict.rs:27:5
    |
 LL |     fn method(&self) -> u8;
    |     ----------------------- item in trait
@@ -10,7 +10,7 @@ LL |     reuse Trait2::*;
    |     ^^^^^^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `method`:
-  --> $DIR/glob-glob-conflict.rs:34:5
+  --> $DIR/glob-glob-conflict.rs:33:5
    |
 LL |     fn method(&self) -> u8;
    |     ----------------------- item in trait
@@ -21,35 +21,35 @@ LL |     reuse Trait1::*;
    |     ^^^^^^^^^^^^^^^^ duplicate definition
 
 error[E0061]: this function takes 1 argument but 0 arguments were supplied
-  --> $DIR/glob-glob-conflict.rs:10:8
+  --> $DIR/glob-glob-conflict.rs:27:19
    |
-LL |     fn method(&self) -> u8;
-   |        ^^^^^^ argument #1 of type `&_` is missing
+LL |     reuse Trait2::*;
+   |                   ^ argument #1 of type `&_` is missing
    |
 note: method defined here
-  --> $DIR/glob-glob-conflict.rs:10:8
+  --> $DIR/glob-glob-conflict.rs:8:8
    |
 LL |     fn method(&self) -> u8;
    |        ^^^^^^  ----
 help: provide the argument
    |
-LL |     fn method(/* value */)(&self) -> u8;
-   |              +++++++++++++
+LL |     reuse Trait2::*(/* value */);
+   |                    +++++++++++++
 
 error[E0308]: mismatched types
-  --> $DIR/glob-glob-conflict.rs:10:8
+  --> $DIR/glob-glob-conflict.rs:27:19
    |
-LL |     fn method(&self) -> u8;
-   |        ^^^^^^- help: consider using a semicolon here: `;`
-   |        |
-   |        expected `()`, found `u8`
-   |        expected `()` because of default return type
+LL |     reuse Trait2::*;
+   |                   ^- help: consider using a semicolon here: `;`
+   |                   |
+   |                   expected `()`, found `u8`
+   |                   expected `()` because of default return type
 
 error[E0061]: this function takes 1 argument but 0 arguments were supplied
-  --> $DIR/glob-glob-conflict.rs:5:8
+  --> $DIR/glob-glob-conflict.rs:33:19
    |
-LL |     fn method(&self) -> u8;
-   |        ^^^^^^ argument #1 of type `&_` is missing
+LL |     reuse Trait1::*;
+   |                   ^ argument #1 of type `&_` is missing
    |
 note: method defined here
   --> $DIR/glob-glob-conflict.rs:5:8
@@ -58,17 +58,17 @@ LL |     fn method(&self) -> u8;
    |        ^^^^^^  ----
 help: provide the argument
    |
-LL |     fn method(/* value */)(&self) -> u8;
-   |              +++++++++++++
+LL |     reuse Trait1::*(/* value */);
+   |                    +++++++++++++
 
 error[E0308]: mismatched types
-  --> $DIR/glob-glob-conflict.rs:5:8
+  --> $DIR/glob-glob-conflict.rs:33:19
    |
-LL |     fn method(&self) -> u8;
-   |        ^^^^^^- help: consider using a semicolon here: `;`
-   |        |
-   |        expected `()`, found `u8`
-   |        expected `()` because of default return type
+LL |     reuse Trait1::*;
+   |                   ^- help: consider using a semicolon here: `;`
+   |                   |
+   |                   expected `()`, found `u8`
+   |                   expected `()` because of default return type
 
 error: aborting due to 6 previous errors