Update tests

2 files changed, 38 insertions, 38 deletions

diff --git a/src/test/ui/binop/binop-consume-args.stderr b/src/test/ui/binop/binop-consume-args.stderr
index 0b5d2200b9f..9246c116709 100644
--- a/src/test/ui/binop/binop-consume-args.stderr
+++ b/src/test/ui/binop/binop-consume-args.stderr
@@ -3,7 +3,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs + rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -13,8 +13,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs + rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -24,7 +24,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs - rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -34,8 +34,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs - rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -45,7 +45,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs * rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -55,8 +55,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs * rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -66,7 +66,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs / rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -76,8 +76,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs / rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -87,7 +87,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs % rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -97,8 +97,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs % rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -108,7 +108,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs & rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -118,8 +118,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs & rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -129,7 +129,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs | rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -139,8 +139,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs | rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -150,7 +150,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs ^ rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -160,8 +160,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs ^ rhs;
    |           --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -171,7 +171,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs << rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -181,8 +181,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs << rhs;
    |            --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
@@ -192,7 +192,7 @@ error[E0382]: use of moved value: `lhs`
    |
 LL |     lhs >> rhs;
    |     --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
+LL |     drop(lhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
@@ -202,8 +202,8 @@ error[E0382]: use of moved value: `rhs`
    |
 LL |     lhs >> rhs;
    |            --- value moved here
-LL |     drop(lhs);  //~ ERROR use of moved value: `lhs`
-LL |     drop(rhs);  //~ ERROR use of moved value: `rhs`
+LL |     drop(lhs);
+LL |     drop(rhs);
    |          ^^^ value used here after move
    |
    = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/src/test/ui/binop/binop-move-semantics.stderr
index b1dc70d379d..acc2620681b 100644
--- a/src/test/ui/binop/binop-move-semantics.stderr
+++ b/src/test/ui/binop/binop-move-semantics.stderr
@@ -4,7 +4,7 @@ error[E0382]: use of moved value: `x`
 LL |     x
    |     - value moved here
 LL |     +
-LL |     x;  //~ ERROR: use of moved value
+LL |     x;
    |     ^ value used here after move
    |
    = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait
@@ -15,7 +15,7 @@ error[E0382]: use of moved value: `x`
 LL |     x
    |     - value moved here
 LL |     +
-LL |     x.clone();  //~ ERROR: use of moved value
+LL |     x.clone();
    |     ^ value used here after move
    |
    = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait
@@ -26,7 +26,7 @@ error[E0505]: cannot move out of `x` because it is borrowed
 LL |     let m = &x;
    |              - borrow of `x` occurs here
 ...
-LL |     x  //~ ERROR: cannot move out of `x` because it is borrowed
+LL |     x
    |     ^ move out of `x` occurs here
 
 error[E0505]: cannot move out of `y` because it is borrowed
@@ -35,19 +35,19 @@ error[E0505]: cannot move out of `y` because it is borrowed
 LL |     let n = &mut y;
    |                  - borrow of `y` occurs here
 ...
-LL |     y;  //~ ERROR: cannot move out of `y` because it is borrowed
+LL |     y;
    |     ^ move out of `y` occurs here
 
 error[E0507]: cannot move out of borrowed content
   --> $DIR/binop-move-semantics.rs:30:5
    |
-LL |     *m  //~ ERROR: cannot move out of borrowed content
+LL |     *m
    |     ^^ cannot move out of borrowed content
 
 error[E0507]: cannot move out of borrowed content
   --> $DIR/binop-move-semantics.rs:32:5
    |
-LL |     *n;  //~ ERROR: cannot move out of borrowed content
+LL |     *n;
    |     ^^ cannot move out of borrowed content
 
 error[E0502]: cannot borrow `f` as immutable because it is also borrowed as mutable
@@ -56,7 +56,7 @@ error[E0502]: cannot borrow `f` as immutable because it is also borrowed as muta
 LL |     &mut f
    |          - mutable borrow occurs here
 LL |     +
-LL |     &f;  //~ ERROR: cannot borrow `f` as immutable because it is also borrowed as mutable
+LL |     &f;
    |      ^
    |      |
    |      immutable borrow occurs here
@@ -68,7 +68,7 @@ error[E0502]: cannot borrow `f` as mutable because it is also borrowed as immuta
 LL |     &f
    |      - immutable borrow occurs here
 LL |     +
-LL |     &mut f;  //~ ERROR: cannot borrow `f` as mutable because it is also borrowed as immutable
+LL |     &mut f;
    |          ^
    |          |
    |          mutable borrow occurs here