Update tests

2 files changed, 36 insertions, 36 deletions

diff --git a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr b/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr
index 759a16cdafd..2187c61fabf 100644
--- a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr
+++ b/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr
@@ -28,7 +28,7 @@ LL |     fn bar(self: &Bar<usize>, x: isize) -> isize {
 error[E0308]: mismatched method receiver
   --> $DIR/ufcs-explicit-self-bad.rs:37:21
    |
-LL |     fn dummy2(self: &Bar<T>) {} //~ ERROR mismatched method receiver
+LL |     fn dummy2(self: &Bar<T>) {}
    |                     ^^^^^^^ lifetime mismatch
    |
    = note: expected type `&'a Bar<T>`
@@ -36,7 +36,7 @@ LL |     fn dummy2(self: &Bar<T>) {} //~ ERROR mismatched method receiver
 note: the anonymous lifetime #1 defined on the method body at 37:5...
   --> $DIR/ufcs-explicit-self-bad.rs:37:5
    |
-LL |     fn dummy2(self: &Bar<T>) {} //~ ERROR mismatched method receiver
+LL |     fn dummy2(self: &Bar<T>) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 35:6
   --> $DIR/ufcs-explicit-self-bad.rs:35:6
@@ -47,7 +47,7 @@ LL | impl<'a, T> SomeTrait for &'a Bar<T> {
 error[E0308]: mismatched method receiver
   --> $DIR/ufcs-explicit-self-bad.rs:37:21
    |
-LL |     fn dummy2(self: &Bar<T>) {} //~ ERROR mismatched method receiver
+LL |     fn dummy2(self: &Bar<T>) {}
    |                     ^^^^^^^ lifetime mismatch
    |
    = note: expected type `&'a Bar<T>`
@@ -60,7 +60,7 @@ LL | impl<'a, T> SomeTrait for &'a Bar<T> {
 note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 37:5
   --> $DIR/ufcs-explicit-self-bad.rs:37:5
    |
-LL |     fn dummy2(self: &Bar<T>) {} //~ ERROR mismatched method receiver
+LL |     fn dummy2(self: &Bar<T>) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0308]: mismatched method receiver
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
index 3cd1cac71fa..799dbf7a6d2 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
@@ -1,163 +1,163 @@
 error[E0433]: failed to resolve: not a module `Y`
   --> $DIR/ufcs-partially-resolved.rs:48:22
    |
-LL |     let _: <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
+LL |     let _: <u8 as E::Y>::NN;
    |                      ^ not a module `Y`
 
 error[E0433]: failed to resolve: not a module `Y`
   --> $DIR/ufcs-partially-resolved.rs:50:15
    |
-LL |     <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
+LL |     <u8 as E::Y>::NN;
    |               ^ not a module `Y`
 
 error[E0576]: cannot find associated type `N` in trait `Tr`
   --> $DIR/ufcs-partially-resolved.rs:19:24
    |
-LL |     let _: <u8 as Tr>::N; //~ ERROR cannot find associated type `N` in trait `Tr`
+LL |     let _: <u8 as Tr>::N;
    |                        ^ help: an associated type with a similar name exists: `Y`
 
 error[E0576]: cannot find associated type `N` in enum `E`
   --> $DIR/ufcs-partially-resolved.rs:20:23
    |
-LL |     let _: <u8 as E>::N; //~ ERROR cannot find associated type `N` in enum `E`
+LL |     let _: <u8 as E>::N;
    |                       ^ not found in `E`
 
 error[E0576]: cannot find associated type `N` in `A`
   --> $DIR/ufcs-partially-resolved.rs:21:23
    |
-LL |     let _: <u8 as A>::N; //~ ERROR cannot find associated type `N` in `A`
+LL |     let _: <u8 as A>::N;
    |                       ^ not found in `A`
 
 error[E0576]: cannot find method or associated constant `N` in trait `Tr`
   --> $DIR/ufcs-partially-resolved.rs:22:17
    |
-LL |     <u8 as Tr>::N; //~ ERROR cannot find method or associated constant `N` in trait `Tr`
+LL |     <u8 as Tr>::N;
    |                 ^ help: a method with a similar name exists: `Y`
 
 error[E0576]: cannot find method or associated constant `N` in enum `E`
   --> $DIR/ufcs-partially-resolved.rs:23:16
    |
-LL |     <u8 as E>::N; //~ ERROR cannot find method or associated constant `N` in enum `E`
+LL |     <u8 as E>::N;
    |                ^ not found in `E`
 
 error[E0576]: cannot find method or associated constant `N` in `A`
   --> $DIR/ufcs-partially-resolved.rs:24:16
    |
-LL |     <u8 as A>::N; //~ ERROR cannot find method or associated constant `N` in `A`
+LL |     <u8 as A>::N;
    |                ^ not found in `A`
 
 error[E0575]: expected associated type, found variant `E::Y`
   --> $DIR/ufcs-partially-resolved.rs:26:12
    |
-LL |     let _: <u8 as E>::Y; //~ ERROR expected associated type, found variant `E::Y`
+LL |     let _: <u8 as E>::Y;
    |            ^^^^^^^^^^^^ not a associated type
 
 error[E0575]: expected method or associated constant, found unit variant `E::Y`
   --> $DIR/ufcs-partially-resolved.rs:28:5
    |
-LL |     <u8 as E>::Y; //~ ERROR expected method or associated constant, found unit variant `E::Y`
+LL |     <u8 as E>::Y;
    |     ^^^^^^^^^^^^ not a method or associated constant
 
 error[E0576]: cannot find associated type `N` in trait `Tr`
   --> $DIR/ufcs-partially-resolved.rs:30:24
    |
-LL |     let _: <u8 as Tr>::N::NN; //~ ERROR cannot find associated type `N` in trait `Tr`
+LL |     let _: <u8 as Tr>::N::NN;
    |                        ^ help: an associated type with a similar name exists: `Y`
 
 error[E0576]: cannot find associated type `N` in enum `E`
   --> $DIR/ufcs-partially-resolved.rs:31:23
    |
-LL |     let _: <u8 as E>::N::NN; //~ ERROR cannot find associated type `N` in enum `E`
+LL |     let _: <u8 as E>::N::NN;
    |                       ^ not found in `E`
 
 error[E0576]: cannot find associated type `N` in `A`
   --> $DIR/ufcs-partially-resolved.rs:32:23
    |
-LL |     let _: <u8 as A>::N::NN; //~ ERROR cannot find associated type `N` in `A`
+LL |     let _: <u8 as A>::N::NN;
    |                       ^ not found in `A`
 
 error[E0576]: cannot find associated type `N` in trait `Tr`
   --> $DIR/ufcs-partially-resolved.rs:33:17
    |
-LL |     <u8 as Tr>::N::NN; //~ ERROR cannot find associated type `N` in trait `Tr`
+LL |     <u8 as Tr>::N::NN;
    |                 ^ help: an associated type with a similar name exists: `Y`
 
 error[E0576]: cannot find associated type `N` in enum `E`
   --> $DIR/ufcs-partially-resolved.rs:34:16
    |
-LL |     <u8 as E>::N::NN; //~ ERROR cannot find associated type `N` in enum `E`
+LL |     <u8 as E>::N::NN;
    |                ^ not found in `E`
 
 error[E0576]: cannot find associated type `N` in `A`
   --> $DIR/ufcs-partially-resolved.rs:35:16
    |
-LL |     <u8 as A>::N::NN; //~ ERROR cannot find associated type `N` in `A`
+LL |     <u8 as A>::N::NN;
    |                ^ not found in `A`
 
 error[E0575]: expected associated type, found variant `E::Y`
   --> $DIR/ufcs-partially-resolved.rs:37:12
    |
-LL |     let _: <u8 as E>::Y::NN; //~ ERROR expected associated type, found variant `E::Y`
+LL |     let _: <u8 as E>::Y::NN;
    |            ^^^^^^^^^^^^^^^^ not a associated type
 
 error[E0575]: expected associated type, found variant `E::Y`
   --> $DIR/ufcs-partially-resolved.rs:39:5
    |
-LL |     <u8 as E>::Y::NN; //~ ERROR expected associated type, found variant `E::Y`
+LL |     <u8 as E>::Y::NN;
    |     ^^^^^^^^^^^^^^^^ not a associated type
 
 error[E0576]: cannot find associated type `NN` in `Tr::N`
   --> $DIR/ufcs-partially-resolved.rs:41:27
    |
-LL |     let _: <u8 as Tr::N>::NN; //~ ERROR cannot find associated type `NN` in `Tr::N`
+LL |     let _: <u8 as Tr::N>::NN;
    |                           ^^ not found in `Tr::N`
 
 error[E0576]: cannot find associated type `NN` in `E::N`
   --> $DIR/ufcs-partially-resolved.rs:42:26
    |
-LL |     let _: <u8 as E::N>::NN; //~ ERROR cannot find associated type `NN` in `E::N`
+LL |     let _: <u8 as E::N>::NN;
    |                          ^^ not found in `E::N`
 
 error[E0576]: cannot find associated type `NN` in `A::N`
   --> $DIR/ufcs-partially-resolved.rs:43:26
    |
-LL |     let _: <u8 as A::N>::NN; //~ ERROR cannot find associated type `NN` in `A::N`
+LL |     let _: <u8 as A::N>::NN;
    |                          ^^ not found in `A::N`
 
 error[E0576]: cannot find method or associated constant `NN` in `Tr::N`
   --> $DIR/ufcs-partially-resolved.rs:44:20
    |
-LL |     <u8 as Tr::N>::NN; //~ ERROR cannot find method or associated constant `NN` in `Tr::N`
+LL |     <u8 as Tr::N>::NN;
    |                    ^^ not found in `Tr::N`
 
 error[E0576]: cannot find method or associated constant `NN` in `E::N`
   --> $DIR/ufcs-partially-resolved.rs:45:19
    |
-LL |     <u8 as E::N>::NN; //~ ERROR cannot find method or associated constant `NN` in `E::N`
+LL |     <u8 as E::N>::NN;
    |                   ^^ not found in `E::N`
 
 error[E0576]: cannot find method or associated constant `NN` in `A::N`
   --> $DIR/ufcs-partially-resolved.rs:46:19
    |
-LL |     <u8 as A::N>::NN; //~ ERROR cannot find method or associated constant `NN` in `A::N`
+LL |     <u8 as A::N>::NN;
    |                   ^^ not found in `A::N`
 
 error[E0576]: cannot find associated type `NN` in `Tr::Y`
   --> $DIR/ufcs-partially-resolved.rs:47:27
    |
-LL |     let _: <u8 as Tr::Y>::NN; //~ ERROR cannot find associated type `NN` in `Tr::Y`
+LL |     let _: <u8 as Tr::Y>::NN;
    |                           ^^ not found in `Tr::Y`
 
 error[E0576]: cannot find method or associated constant `NN` in `Tr::Y`
   --> $DIR/ufcs-partially-resolved.rs:49:20
    |
-LL |     <u8 as Tr::Y>::NN; //~ ERROR cannot find method or associated constant `NN` in `Tr::Y`
+LL |     <u8 as Tr::Y>::NN;
    |                    ^^ not found in `Tr::Y`
 
 error[E0575]: expected associated type, found method `Dr::Z`
   --> $DIR/ufcs-partially-resolved.rs:52:12
    |
-LL |     let _: <u8 as Dr>::Z; //~ ERROR expected associated type, found method `Dr::Z`
+LL |     let _: <u8 as Dr>::Z;
    |            ^^^^^^^^^^^^-
    |                        |
    |                        help: an associated type with a similar name exists: `X`
@@ -165,7 +165,7 @@ LL |     let _: <u8 as Dr>::Z; //~ ERROR expected associated type, found method
 error[E0575]: expected method or associated constant, found associated type `Dr::X`
   --> $DIR/ufcs-partially-resolved.rs:53:5
    |
-LL |     <u8 as Dr>::X; //~ ERROR expected method or associated constant, found associated type `Dr::X`
+LL |     <u8 as Dr>::X;
    |     ^^^^^^^^^^^^-
    |                 |
    |                 help: a method with a similar name exists: `Z`
@@ -175,7 +175,7 @@ LL |     <u8 as Dr>::X; //~ ERROR expected method or associated constant, found
 error[E0575]: expected associated type, found method `Dr::Z`
   --> $DIR/ufcs-partially-resolved.rs:54:12
    |
-LL |     let _: <u8 as Dr>::Z::N; //~ ERROR expected associated type, found method `Dr::Z`
+LL |     let _: <u8 as Dr>::Z::N;
    |            ^^^^^^^^^^^^-^^^
    |                        |
    |                        help: an associated type with a similar name exists: `X`
@@ -183,13 +183,13 @@ LL |     let _: <u8 as Dr>::Z::N; //~ ERROR expected associated type, found meth
 error[E0223]: ambiguous associated type
   --> $DIR/ufcs-partially-resolved.rs:36:12
    |
-LL |     let _: <u8 as Tr>::Y::NN; //~ ERROR ambiguous associated type
+LL |     let _: <u8 as Tr>::Y::NN;
    |            ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<<u8 as Tr>::Y as Trait>::NN`
 
 error[E0599]: no associated item named `NN` found for type `<u8 as Tr>::Y` in the current scope
   --> $DIR/ufcs-partially-resolved.rs:38:20
    |
-LL |     <u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found for type `<u8 as Tr>::Y`
+LL |     <u8 as Tr>::Y::NN;
    |     ---------------^^
    |     |
    |     associated item not found in `<u8 as Tr>::Y`
@@ -197,7 +197,7 @@ LL |     <u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found for ty
 error[E0599]: no associated item named `N` found for type `<u8 as Dr>::X` in the current scope
   --> $DIR/ufcs-partially-resolved.rs:55:20
    |
-LL |     <u8 as Dr>::X::N; //~ ERROR no associated item named `N` found for type `<u8 as Dr>::X`
+LL |     <u8 as Dr>::X::N;
    |     ---------------^
    |     |
    |     associated item not found in `<u8 as Dr>::X`