about summary refs log tree commit diff
path: root/src/test/ui/wf
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/wf')
-rw-r--r--src/test/ui/wf/wf-array-elem-sized.stderr2
-rw-r--r--src/test/ui/wf/wf-enum-bound.stderr2
-rw-r--r--src/test/ui/wf/wf-enum-fields-struct-variant.stderr2
-rw-r--r--src/test/ui/wf/wf-enum-fields.stderr2
-rw-r--r--src/test/ui/wf/wf-fn-where-clause.stderr2
-rw-r--r--src/test/ui/wf/wf-impl-associated-type-region.stderr4
-rw-r--r--src/test/ui/wf/wf-in-fn-arg.stderr2
-rw-r--r--src/test/ui/wf/wf-in-fn-ret.stderr2
-rw-r--r--src/test/ui/wf/wf-in-fn-type-arg.stderr2
-rw-r--r--src/test/ui/wf/wf-in-fn-type-ret.stderr2
-rw-r--r--src/test/ui/wf/wf-in-fn-type-static.stderr8
-rw-r--r--src/test/ui/wf/wf-in-fn-where-clause.stderr2
-rw-r--r--src/test/ui/wf/wf-in-obj-type-static.stderr4
-rw-r--r--src/test/ui/wf/wf-in-obj-type-trait.stderr2
-rw-r--r--src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr2
-rw-r--r--src/test/ui/wf/wf-inherent-impl-where-clause.stderr2
-rw-r--r--src/test/ui/wf/wf-misc-methods-issue-28609.stderr24
-rw-r--r--src/test/ui/wf/wf-object-safe.stderr2
-rw-r--r--src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr8
-rw-r--r--src/test/ui/wf/wf-static-method.stderr12
-rw-r--r--src/test/ui/wf/wf-struct-bound.stderr2
-rw-r--r--src/test/ui/wf/wf-struct-field.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-associated-type-bound.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-bound.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-default-fn-arg.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-default-fn-ret.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-default-fn-where-clause.stderr2
-rw-r--r--src/test/ui/wf/wf-trait-superbound.stderr2
28 files changed, 52 insertions, 52 deletions
diff --git a/src/test/ui/wf/wf-array-elem-sized.stderr b/src/test/ui/wf/wf-array-elem-sized.stderr
index 69df9ea7857..b222d07580e 100644
--- a/src/test/ui/wf/wf-array-elem-sized.stderr
+++ b/src/test/ui/wf/wf-array-elem-sized.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
   --> $DIR/wf-array-elem-sized.rs:7:5
    |
-LL |     foo: [[u8]], //~ ERROR E0277
+LL |     foo: [[u8]],
    |     ^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `[u8]`
diff --git a/src/test/ui/wf/wf-enum-bound.stderr b/src/test/ui/wf/wf-enum-bound.stderr
index 487592dcaca..de28a882f13 100644
--- a/src/test/ui/wf/wf-enum-bound.stderr
+++ b/src/test/ui/wf/wf-enum-bound.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-enum-bound.rs:9:1
    |
-LL | / enum SomeEnum<T,U> //~ ERROR E0277
+LL | / enum SomeEnum<T,U>
 LL | |     where T: ExtraCopy<U>
 LL | | {
 LL | |     SomeVariant(T,U)
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
index f4b8ec0c668..6c1267cf7e1 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
+++ b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
   --> $DIR/wf-enum-fields-struct-variant.rs:13:9
    |
-LL |         f: IsCopy<A> //~ ERROR E0277
+LL |         f: IsCopy<A>
    |         ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
    |
    = help: consider adding a `where A: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-enum-fields.stderr b/src/test/ui/wf/wf-enum-fields.stderr
index 600dd3dc03d..9c4eec6c5fb 100644
--- a/src/test/ui/wf/wf-enum-fields.stderr
+++ b/src/test/ui/wf/wf-enum-fields.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
   --> $DIR/wf-enum-fields.rs:12:17
    |
-LL |     SomeVariant(IsCopy<A>) //~ ERROR E0277
+LL |     SomeVariant(IsCopy<A>)
    |                 ^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
    |
    = help: consider adding a `where A: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/src/test/ui/wf/wf-fn-where-clause.stderr
index 594ce7d2f49..f1648aa12ac 100644
--- a/src/test/ui/wf/wf-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-fn-where-clause.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-fn-where-clause.rs:8:1
    |
-LL | / fn foo<T,U>() where T: ExtraCopy<U> //~ ERROR E0277
+LL | / fn foo<T,U>() where T: ExtraCopy<U>
 LL | | {
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `U`
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.stderr b/src/test/ui/wf/wf-impl-associated-type-region.stderr
index de7e8fa9a28..9cc36025305 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.stderr
+++ b/src/test/ui/wf/wf-impl-associated-type-region.stderr
@@ -3,13 +3,13 @@ error[E0309]: the parameter type `T` may not live long enough
    |
 LL | impl<'a, T> Foo<'a> for T {
    |          - help: consider adding an explicit lifetime bound `T: 'a`...
-LL |     type Bar = &'a T; //~ ERROR E0309
+LL |     type Bar = &'a T;
    |     ^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'a T` does not outlive the data it points at
   --> $DIR/wf-impl-associated-type-region.rs:10:5
    |
-LL |     type Bar = &'a T; //~ ERROR E0309
+LL |     type Bar = &'a T;
    |     ^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/wf/wf-in-fn-arg.stderr b/src/test/ui/wf/wf-in-fn-arg.stderr
index 987984060e6..8635dad8516 100644
--- a/src/test/ui/wf/wf-in-fn-arg.stderr
+++ b/src/test/ui/wf/wf-in-fn-arg.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-fn-arg.rs:10:1
    |
-LL | / fn bar<T>(_: &MustBeCopy<T>) //~ ERROR E0277
+LL | / fn bar<T>(_: &MustBeCopy<T>)
 LL | | {
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `T`
diff --git a/src/test/ui/wf/wf-in-fn-ret.stderr b/src/test/ui/wf/wf-in-fn-ret.stderr
index 81aae855b84..3879f7b0a4b 100644
--- a/src/test/ui/wf/wf-in-fn-ret.stderr
+++ b/src/test/ui/wf/wf-in-fn-ret.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-fn-ret.rs:10:1
    |
-LL | / fn bar<T>() -> MustBeCopy<T> //~ ERROR E0277
+LL | / fn bar<T>() -> MustBeCopy<T>
 LL | | {
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `T`
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.stderr b/src/test/ui/wf/wf-in-fn-type-arg.stderr
index e60529dba1e..40cb4a7050c 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-arg.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-fn-type-arg.rs:9:5
    |
-LL |     x: fn(MustBeCopy<T>) //~ ERROR E0277
+LL |     x: fn(MustBeCopy<T>)
    |     ^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
    |
    = help: consider adding a `where T: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.stderr b/src/test/ui/wf/wf-in-fn-type-ret.stderr
index 9f18a00926d..059f164e25c 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-ret.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-fn-type-ret.rs:9:5
    |
-LL |     x: fn() -> MustBeCopy<T> //~ ERROR E0277
+LL |     x: fn() -> MustBeCopy<T>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
    |
    = help: consider adding a `where T: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-in-fn-type-static.stderr b/src/test/ui/wf/wf-in-fn-type-static.stderr
index 1fabfb04add..8952c78aacd 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-static.stderr
@@ -4,13 +4,13 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | struct Foo<T> {
    |            - help: consider adding an explicit lifetime bound `T: 'static`...
 LL |     // needs T: 'static
-LL |     x: fn() -> &'static T //~ ERROR E0310
+LL |     x: fn() -> &'static T
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'static T` does not outlive the data it points at
   --> $DIR/wf-in-fn-type-static.rs:13:5
    |
-LL |     x: fn() -> &'static T //~ ERROR E0310
+LL |     x: fn() -> &'static T
    |     ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0310]: the parameter type `T` may not live long enough
@@ -19,13 +19,13 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | struct Bar<T> {
    |            - help: consider adding an explicit lifetime bound `T: 'static`...
 LL |     // needs T: Copy
-LL |     x: fn(&'static T) //~ ERROR E0310
+LL |     x: fn(&'static T)
    |     ^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'static T` does not outlive the data it points at
   --> $DIR/wf-in-fn-type-static.rs:18:5
    |
-LL |     x: fn(&'static T) //~ ERROR E0310
+LL |     x: fn(&'static T)
    |     ^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.stderr b/src/test/ui/wf/wf-in-fn-where-clause.stderr
index 8d6700e3571..1e732a3341c 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-in-fn-where-clause.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-fn-where-clause.rs:9:1
    |
-LL | / fn bar<T,U>() //~ ERROR E0277
+LL | / fn bar<T,U>()
 LL | |     where T: MustBeCopy<U>
 LL | | {
 LL | | }
diff --git a/src/test/ui/wf/wf-in-obj-type-static.stderr b/src/test/ui/wf/wf-in-obj-type-static.stderr
index 9e0628e3ec6..cc06b9243f7 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.stderr
+++ b/src/test/ui/wf/wf-in-obj-type-static.stderr
@@ -4,13 +4,13 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | struct Foo<T> {
    |            - help: consider adding an explicit lifetime bound `T: 'static`...
 LL |     // needs T: 'static
-LL |     x: Object<&'static T> //~ ERROR E0310
+LL |     x: Object<&'static T>
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'static T` does not outlive the data it points at
   --> $DIR/wf-in-obj-type-static.rs:14:5
    |
-LL |     x: Object<&'static T> //~ ERROR E0310
+LL |     x: Object<&'static T>
    |     ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.stderr b/src/test/ui/wf/wf-in-obj-type-trait.stderr
index a4a14817d3f..94b3de78898 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.stderr
+++ b/src/test/ui/wf/wf-in-obj-type-trait.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-in-obj-type-trait.rs:11:5
    |
-LL |     x: Object<MustBeCopy<T>> //~ ERROR E0277
+LL |     x: Object<MustBeCopy<T>>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
    |
    = help: consider adding a `where T: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
index ba9d3d7877d..b79093f7d02 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
+++ b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-inherent-impl-method-where-clause.rs:12:5
    |
-LL | /     fn foo(self) where T: ExtraCopy<U> //~ ERROR E0277
+LL | /     fn foo(self) where T: ExtraCopy<U>
 LL | |     {}
    | |______^ the trait `std::marker::Copy` is not implemented for `U`
    |
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
index 2ed9cc56f94..f10ff841acb 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
+++ b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-inherent-impl-where-clause.rs:11:1
    |
-LL | / impl<T,U> Foo<T,U> where T: ExtraCopy<U> //~ ERROR E0277
+LL | / impl<T,U> Foo<T,U> where T: ExtraCopy<U>
 LL | | {
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `U`
diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr b/src/test/ui/wf/wf-misc-methods-issue-28609.stderr
index 46dc4dc8870..d470aecd266 100644
--- a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr
+++ b/src/test/ui/wf/wf-misc-methods-issue-28609.stderr
@@ -1,7 +1,7 @@
 error[E0597]: borrowed value does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:22:31
    |
-LL |     s.transmute_inherent(&mut 42) //~ ERROR does not live long enough
+LL |     s.transmute_inherent(&mut 42)
    |                               ^^ temporary value does not live long enough
 LL | }
    | - temporary value only lives until here
@@ -11,14 +11,14 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
    |
 LL | / fn return_dangling_pointer_inherent(s: S2) -> &u32 {
 LL | |     let s = s;
-LL | |     s.transmute_inherent(&mut 42) //~ ERROR does not live long enough
+LL | |     s.transmute_inherent(&mut 42)
 LL | | }
    | |_^
 
 error[E0597]: `four` does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:35:20
    |
-LL |     s.bomb = Some(&four); //~ ERROR does not live long enough
+LL |     s.bomb = Some(&four);
    |                    ^^^^ borrowed value does not live long enough
 LL |     &s
 LL | }
@@ -30,7 +30,7 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
 LL | / fn return_dangling_pointer_coerce(s: S2) -> &u32 {
 LL | |     let four = 4;
 LL | |     let mut s = s;
-LL | |     s.bomb = Some(&four); //~ ERROR does not live long enough
+LL | |     s.bomb = Some(&four);
 LL | |     &s
 LL | | }
    | |_^
@@ -38,7 +38,7 @@ LL | | }
 error[E0597]: `four` does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:42:20
    |
-LL |     s.bomb = Some(&four); //~ ERROR does not live long enough
+LL |     s.bomb = Some(&four);
    |                    ^^^^ borrowed value does not live long enough
 LL |     &*s
 LL | }
@@ -50,7 +50,7 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
 LL | / fn return_dangling_pointer_unary_op(s: S2) -> &u32 {
 LL | |     let four = 4;
 LL | |     let mut s = s;
-LL | |     s.bomb = Some(&four); //~ ERROR does not live long enough
+LL | |     s.bomb = Some(&four);
 LL | |     &*s
 LL | | }
    | |_^
@@ -58,7 +58,7 @@ LL | | }
 error[E0597]: borrowed value does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:53:15
    |
-LL |     s << &mut 3 //~ ERROR does not live long enough
+LL |     s << &mut 3
    |               ^ temporary value does not live long enough
 LL | }
    | - temporary value only lives until here
@@ -68,14 +68,14 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
    |
 LL | / fn return_dangling_pointer_binary_op(s: S2) -> &u32 {
 LL | |     let s = s;
-LL | |     s << &mut 3 //~ ERROR does not live long enough
+LL | |     s << &mut 3
 LL | | }
    | |_^
 
 error[E0597]: borrowed value does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:58:16
    |
-LL |     s.shl(&mut 3) //~ ERROR does not live long enough
+LL |     s.shl(&mut 3)
    |                ^ temporary value does not live long enough
 LL | }
    | - temporary value only lives until here
@@ -85,14 +85,14 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
    |
 LL | / fn return_dangling_pointer_method(s: S2) -> &u32 {
 LL | |     let s = s;
-LL | |     s.shl(&mut 3) //~ ERROR does not live long enough
+LL | |     s.shl(&mut 3)
 LL | | }
    | |_^
 
 error[E0597]: borrowed value does not live long enough
   --> $DIR/wf-misc-methods-issue-28609.rs:63:21
    |
-LL |     S2::shl(s, &mut 3) //~ ERROR does not live long enough
+LL |     S2::shl(s, &mut 3)
    |                     ^ temporary value does not live long enough
 LL | }
    | - temporary value only lives until here
@@ -102,7 +102,7 @@ note: borrowed value must be valid for the anonymous lifetime #1 defined on the
    |
 LL | / fn return_dangling_pointer_ufcs(s: S2) -> &u32 {
 LL | |     let s = s;
-LL | |     S2::shl(s, &mut 3) //~ ERROR does not live long enough
+LL | |     S2::shl(s, &mut 3)
 LL | | }
    | |_^
 
diff --git a/src/test/ui/wf/wf-object-safe.stderr b/src/test/ui/wf/wf-object-safe.stderr
index 2a514d9d2c2..87e8105d4af 100644
--- a/src/test/ui/wf/wf-object-safe.stderr
+++ b/src/test/ui/wf/wf-object-safe.stderr
@@ -1,7 +1,7 @@
 error[E0038]: the trait `A` cannot be made into an object
   --> $DIR/wf-object-safe.rs:9:13
    |
-LL |     let _x: &A; //~ ERROR E0038
+LL |     let _x: &A;
    |             ^^ the trait `A` cannot be made into an object
    |
    = note: method `foo` references the `Self` type in its arguments or return type
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
index 04f8c70bbf4..8649506c870 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
+++ b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
@@ -3,13 +3,13 @@ error[E0309]: the parameter type `T` may not live long enough
    |
 LL | impl<'a, T> Trait<'a, T> for usize {
    |          - help: consider adding an explicit lifetime bound `T: 'a`...
-LL |     type Out = &'a fn(T); //~ ERROR `T` may not live long enough
+LL |     type Out = &'a fn(T);
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'a fn(T)` does not outlive the data it points at
   --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:9:5
    |
-LL |     type Out = &'a fn(T); //~ ERROR `T` may not live long enough
+LL |     type Out = &'a fn(T);
    |     ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `T` may not live long enough
@@ -17,13 +17,13 @@ error[E0309]: the parameter type `T` may not live long enough
    |
 LL | impl<'a, T> Trait<'a, T> for u32 {
    |          - help: consider adding an explicit lifetime bound `T: 'a`...
-LL |     type Out = &'a Baz<T>; //~ ERROR `T` may not live long enough
+LL |     type Out = &'a Baz<T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'a (dyn Baz<T> + 'a)` does not outlive the data it points at
   --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:19:5
    |
-LL |     type Out = &'a Baz<T>; //~ ERROR `T` may not live long enough
+LL |     type Out = &'a Baz<T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/wf/wf-static-method.stderr b/src/test/ui/wf/wf-static-method.stderr
index 78ea903e699..32832ceb79c 100644
--- a/src/test/ui/wf/wf-static-method.stderr
+++ b/src/test/ui/wf/wf-static-method.stderr
@@ -1,7 +1,7 @@
 error[E0312]: lifetime of reference outlives lifetime of borrowed content...
   --> $DIR/wf-static-method.rs:17:9
    |
-LL |         u //~ ERROR E0312
+LL |         u
    |         ^
    |
 note: ...the reference is valid for the lifetime 'a as defined on the impl at 14:6...
@@ -18,7 +18,7 @@ LL | impl<'a, 'b> Foo<'a, 'b, Evil<'a, 'b>> for () {
 error[E0478]: lifetime bound not satisfied
   --> $DIR/wf-static-method.rs:26:18
    |
-LL |         let me = Self::make_me(); //~ ERROR lifetime bound not satisfied
+LL |         let me = Self::make_me();
    |                  ^^^^^^^^^^^^^
    |
 note: lifetime parameter instantiated with the lifetime 'b as defined on the impl at 23:10
@@ -35,7 +35,7 @@ LL | impl<'a, 'b> Foo<'a, 'b, ()> for IndirectEvil<'a, 'b> {
 error[E0312]: lifetime of reference outlives lifetime of borrowed content...
   --> $DIR/wf-static-method.rs:33:9
    |
-LL |         u //~ ERROR E0312
+LL |         u
    |         ^
    |
 note: ...the reference is valid for the lifetime 'a as defined on the impl at 31:6...
@@ -52,7 +52,7 @@ LL | impl<'a, 'b> Evil<'a, 'b> {
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements
   --> $DIR/wf-static-method.rs:41:5
    |
-LL |     <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime
+LL |     <()>::static_evil(b)
    |     ^^^^^^^^^^^^^^^^^
    |
 note: first, the lifetime cannot outlive the lifetime 'b as defined on the function body at 40:13...
@@ -63,7 +63,7 @@ LL | fn evil<'a, 'b>(b: &'b u32) -> &'a u32 {
 note: ...so that reference does not outlive borrowed content
   --> $DIR/wf-static-method.rs:41:23
    |
-LL |     <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime
+LL |     <()>::static_evil(b)
    |                       ^
 note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 40:9...
   --> $DIR/wf-static-method.rs:40:9
@@ -73,7 +73,7 @@ LL | fn evil<'a, 'b>(b: &'b u32) -> &'a u32 {
 note: ...so that reference does not outlive borrowed content
   --> $DIR/wf-static-method.rs:41:5
    |
-LL |     <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime
+LL |     <()>::static_evil(b)
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements
diff --git a/src/test/ui/wf/wf-struct-bound.stderr b/src/test/ui/wf/wf-struct-bound.stderr
index 37defb87ee5..1fdcced90cc 100644
--- a/src/test/ui/wf/wf-struct-bound.stderr
+++ b/src/test/ui/wf/wf-struct-bound.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-struct-bound.rs:9:1
    |
-LL | / struct SomeStruct<T,U> //~ ERROR E0277
+LL | / struct SomeStruct<T,U>
 LL | |     where T: ExtraCopy<U>
 LL | | {
 LL | |     data: (T,U)
diff --git a/src/test/ui/wf/wf-struct-field.stderr b/src/test/ui/wf/wf-struct-field.stderr
index e31552b4089..e609f93ff70 100644
--- a/src/test/ui/wf/wf-struct-field.stderr
+++ b/src/test/ui/wf/wf-struct-field.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
   --> $DIR/wf-struct-field.rs:12:5
    |
-LL |     data: IsCopy<A> //~ ERROR E0277
+LL |     data: IsCopy<A>
    |     ^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
    |
    = help: consider adding a `where A: std::marker::Copy` bound
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.stderr b/src/test/ui/wf/wf-trait-associated-type-bound.stderr
index f8ba74a2fdc..658d41218e4 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.stderr
+++ b/src/test/ui/wf/wf-trait-associated-type-bound.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-trait-associated-type-bound.rs:9:1
    |
-LL | / trait SomeTrait<T> { //~ ERROR E0277
+LL | / trait SomeTrait<T> {
 LL | |     type Type1: ExtraCopy<T>;
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `T`
diff --git a/src/test/ui/wf/wf-trait-bound.stderr b/src/test/ui/wf/wf-trait-bound.stderr
index 585571a6a3c..5cc9451bf5c 100644
--- a/src/test/ui/wf/wf-trait-bound.stderr
+++ b/src/test/ui/wf/wf-trait-bound.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
   --> $DIR/wf-trait-bound.rs:9:1
    |
-LL | / trait SomeTrait<T,U> //~ ERROR E0277
+LL | / trait SomeTrait<T,U>
 LL | |     where T: ExtraCopy<U>
 LL | | {
 LL | | }
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.stderr b/src/test/ui/wf/wf-trait-default-fn-arg.stderr
index eeafc06db34..e7133892236 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-arg.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
   --> $DIR/wf-trait-default-fn-arg.rs:11:5
    |
 LL | /     fn bar(&self, x: &Bar<Self>) {
-LL | |         //~^ ERROR E0277
+LL | |
 LL | |         //
 LL | |         // Here, Eq ought to be implemented.
 LL | |     }
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.stderr b/src/test/ui/wf/wf-trait-default-fn-ret.stderr
index 7fabd6b4713..5a310a826dd 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-ret.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
   --> $DIR/wf-trait-default-fn-ret.rs:11:5
    |
 LL | /     fn bar(&self) -> Bar<Self> {
-LL | |         //~^ ERROR E0277
+LL | |
 LL | |         //
 LL | |         // Here, Eq ought to be implemented.
 LL | |         loop { }
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
index 669dd08b21f..d5a00be6d34 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
   --> $DIR/wf-trait-default-fn-where-clause.rs:11:5
    |
 LL | /     fn bar<A>(&self) where A: Bar<Self> {
-LL | |         //~^ ERROR E0277
+LL | |
 LL | |         //
 LL | |         // Here, Eq ought to be implemented.
 LL | |     }
diff --git a/src/test/ui/wf/wf-trait-superbound.stderr b/src/test/ui/wf/wf-trait-superbound.stderr
index 0bcda407d9c..a3c4ab58f65 100644
--- a/src/test/ui/wf/wf-trait-superbound.stderr
+++ b/src/test/ui/wf/wf-trait-superbound.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/wf-trait-superbound.rs:9:1
    |
-LL | / trait SomeTrait<T>: ExtraCopy<T> { //~ ERROR E0277
+LL | / trait SomeTrait<T>: ExtraCopy<T> {
 LL | | }
    | |_^ the trait `std::marker::Copy` is not implemented for `T`
    |