Update tests

12 files changed, 23 insertions, 23 deletions

diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
index 53a07f5196e..9e5f2ee4ce5 100644
--- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
+++ b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
@@ -9,7 +9,7 @@ LL |     let mut x = Vec::new();
 error[E0308]: mismatched types
   --> $DIR/method-ambig-one-trait-unknown-int-type.rs:33:20
    |
-LL |     let y: usize = x.foo(); //~ ERROR mismatched types
+LL |     let y: usize = x.foo();
    |                    ^^^^^^^ expected usize, found isize
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr b/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr
index 15379194777..2b87ddfdf98 100644
--- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr
+++ b/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr
@@ -1,7 +1,7 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-ambig-two-traits-cross-crate.rs:11:21
    |
-LL | fn main() { 1_usize.me(); } //~ ERROR E0034
+LL | fn main() { 1_usize.me(); }
    |                     ^^ multiple `me` found
    |
 note: candidate #1 is defined in an impl of the trait `Me2` for the type `usize`
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr b/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr
index a805ca3ca56..6c493c67e29 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr
+++ b/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr
@@ -1,7 +1,7 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-ambig-two-traits-from-bounds.rs:5:7
    |
-LL |     t.foo(); //~ ERROR E0034
+LL |     t.foo();
    |       ^^^ multiple `foo` found
    |
 note: candidate #1 is defined in the trait `A`
diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr b/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr
index cbb1754935a..5d508d57022 100644
--- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr
+++ b/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr
@@ -1,7 +1,7 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-ambig-two-traits-with-default-method.rs:12:13
    |
-LL |     1_usize.method(); //~ ERROR E0034
+LL |     1_usize.method();
    |             ^^^^^^ multiple `method` found
    |
 note: candidate #1 is defined in an impl of the trait `Foo` for the type `usize`
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr
index 2113add63d6..0e901a98348 100644
--- a/src/test/ui/methods/method-call-err-msg.stderr
+++ b/src/test/ui/methods/method-call-err-msg.stderr
@@ -4,7 +4,7 @@ error[E0061]: this function takes 0 parameters but 1 parameter was supplied
 LL |     fn zero(self) -> Foo { self }
    |     -------------------- defined here
 ...
-LL |     x.zero(0)   //~ ERROR this function takes 0 parameters but 1 parameter was supplied
+LL |     x.zero(0)
    |       ^^^^ expected 0 parameters
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
@@ -13,7 +13,7 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied
 LL |     fn one(self, _: isize) -> Foo { self }
    |     ----------------------------- defined here
 ...
-LL |      .one()     //~ ERROR this function takes 1 parameter but 0 parameters were supplied
+LL |      .one()
    |       ^^^ expected 1 parameter
 
 error[E0061]: this function takes 2 parameters but 1 parameter was supplied
@@ -22,7 +22,7 @@ error[E0061]: this function takes 2 parameters but 1 parameter was supplied
 LL |     fn two(self, _: isize, _: isize) -> Foo { self }
    |     --------------------------------------- defined here
 ...
-LL |      .two(0);   //~ ERROR this function takes 2 parameters but 1 parameter was supplied
+LL |      .two(0);
    |       ^^^ expected 2 parameters
 
 error[E0599]: no method named `take` found for type `Foo` in the current scope
@@ -31,7 +31,7 @@ error[E0599]: no method named `take` found for type `Foo` in the current scope
 LL | pub struct Foo;
    | --------------- method `take` not found for this
 ...
-LL |      .take()    //~ ERROR no method named `take` found for type `Foo` in the current scope
+LL |      .take()
    |       ^^^^
    |
    = note: the method `take` exists but the following trait bounds were not satisfied:
diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr b/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr
index 25432177a85..67fd8d7a13e 100644
--- a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr
+++ b/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr
@@ -1,7 +1,7 @@
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/method-call-lifetime-args-unresolved.rs:2:15
    |
-LL |     0.clone::<'a>(); //~ ERROR use of undeclared lifetime name `'a`
+LL |     0.clone::<'a>();
    |               ^^ undeclared lifetime
 
 error: aborting due to previous error
diff --git a/src/test/ui/methods/method-call-type-binding.stderr b/src/test/ui/methods/method-call-type-binding.stderr
index 27d6f93490b..4b93082ace5 100644
--- a/src/test/ui/methods/method-call-type-binding.stderr
+++ b/src/test/ui/methods/method-call-type-binding.stderr
@@ -1,7 +1,7 @@
 error[E0229]: associated type bindings are not allowed here
   --> $DIR/method-call-type-binding.rs:2:15
    |
-LL |     0.clone::<T = u8>(); //~ ERROR associated type bindings are not allowed here
+LL |     0.clone::<T = u8>();
    |               ^^^^^^ associated type not allowed here
 
 error: aborting due to previous error
diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr b/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
index 2d8449b96de..3c2e9b01767 100644
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
+++ b/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:85:24
    |
-LL |     let _seetype: () = z; //~ ERROR mismatched types
+LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
    |
    = note: expected type `()`
@@ -10,7 +10,7 @@ LL |     let _seetype: () = z; //~ ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:102:24
    |
-LL |     let _seetype: () = z; //~ ERROR mismatched types
+LL |     let _seetype: () = z;
    |                        ^ expected (), found u64
    |
    = note: expected type `()`
@@ -19,7 +19,7 @@ LL |     let _seetype: () = z; //~ ERROR mismatched types
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:120:15
    |
-LL |     let z = x.foo(); //~ ERROR multiple applicable items in scope
+LL |     let z = x.foo();
    |               ^^^ multiple `foo` found
    |
 note: candidate #1 is defined in an impl of the trait `internal::X` for the type `_`
@@ -42,7 +42,7 @@ LL |     fn foo(&self) -> u8;
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:137:24
    |
-LL |     let _seetype: () = z; //~ ERROR mismatched types
+LL |     let _seetype: () = z;
    |                        ^ expected (), found u8
    |
    = note: expected type `()`
@@ -51,7 +51,7 @@ LL |     let _seetype: () = z; //~ ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:155:24
    |
-LL |     let _seetype: () = z; //~ ERROR mismatched types
+LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
    |
    = note: expected type `()`
@@ -60,7 +60,7 @@ LL |     let _seetype: () = z; //~ ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:172:24
    |
-LL |     let _seetype: () = z; //~ ERROR mismatched types
+LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
    |
    = note: expected type `()`
diff --git a/src/test/ui/methods/method-macro-backtrace.stderr b/src/test/ui/methods/method-macro-backtrace.stderr
index 81098bbceb0..7860365476a 100644
--- a/src/test/ui/methods/method-macro-backtrace.stderr
+++ b/src/test/ui/methods/method-macro-backtrace.stderr
@@ -3,7 +3,7 @@ error[E0201]: duplicate definitions with name `bar`:
    |
 LL |     fn bar(&self) { }
    |     ----------------- previous definition of `bar` here
-LL |     fn bar(&self) { } //~ ERROR duplicate definitions
+LL |     fn bar(&self) { }
    |     ^^^^^^^^^^^^^^^^^ duplicate definition
 
 error: aborting due to previous error
diff --git a/src/test/ui/methods/method-missing-call.stderr b/src/test/ui/methods/method-missing-call.stderr
index 886d92aa925..3ab5f66a0c3 100644
--- a/src/test/ui/methods/method-missing-call.stderr
+++ b/src/test/ui/methods/method-missing-call.stderr
@@ -1,13 +1,13 @@
 error[E0615]: attempted to take value of method `get_x` on type `Point`
   --> $DIR/method-missing-call.rs:22:26
    |
-LL |                         .get_x;//~ ERROR attempted to take value of method `get_x` on type `Point`
+LL |                         .get_x;
    |                          ^^^^^ help: use parentheses to call the method: `get_x()`
 
 error[E0615]: attempted to take value of method `filter_map` on type `std::iter::Filter<std::iter::Map<std::slice::Iter<'_, {integer}>, [closure@$DIR/method-missing-call.rs:27:20: 27:25]>, [closure@$DIR/method-missing-call.rs:28:23: 28:35]>`
   --> $DIR/method-missing-call.rs:29:16
    |
-LL |               .filter_map; //~ ERROR attempted to take value of method `filter_map` on type
+LL |               .filter_map;
    |                ^^^^^^^^^^ help: use parentheses to call the method: `filter_map(...)`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/src/test/ui/methods/method-self-arg-1.stderr
index 8c80d01b18c..8485a5403ff 100644
--- a/src/test/ui/methods/method-self-arg-1.stderr
+++ b/src/test/ui/methods/method-self-arg-1.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/method-self-arg-1.rs:11:14
    |
-LL |     Foo::bar(x); //~  ERROR mismatched types
+LL |     Foo::bar(x);
    |              ^
    |              |
    |              expected &Foo, found struct `Foo`
@@ -13,7 +13,7 @@ LL |     Foo::bar(x); //~  ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/method-self-arg-1.rs:15:14
    |
-LL |     Foo::bar(&42); //~  ERROR mismatched types
+LL |     Foo::bar(&42);
    |              ^^^ expected struct `Foo`, found integer
    |
    = note: expected type `&Foo`
diff --git a/src/test/ui/methods/method-self-arg-2.stderr b/src/test/ui/methods/method-self-arg-2.stderr
index 9746ac316d9..56cc8c83fe1 100644
--- a/src/test/ui/methods/method-self-arg-2.stderr
+++ b/src/test/ui/methods/method-self-arg-2.stderr
@@ -3,7 +3,7 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as muta
    |
 LL |     let y = &mut x;
    |                  - mutable borrow occurs here
-LL |     Foo::bar(&x); //~ERROR cannot borrow `x`
+LL |     Foo::bar(&x);
    |               ^ immutable borrow occurs here
 ...
 LL | }
@@ -14,7 +14,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
    |
 LL |     let y = &mut x;
    |                  - first mutable borrow occurs here
-LL |     Foo::baz(&mut x); //~ERROR cannot borrow `x`
+LL |     Foo::baz(&mut x);
    |                   ^ second mutable borrow occurs here
 LL |     y.use_mut();
 LL | }