Rollup merge of #57132 - daxpedda:master, r=steveklabnik

[rust.git] / src / test / ui / std-uncopyable-atomics.nll.stderr

diff --git a/src/test/ui/std-uncopyable-atomics.nll.stderr b/src/test/ui/std-uncopyable-atomics.nll.stderr
index d2576a4baf369ab657e287a0e4b3f71f37beeb33..0a5e7c64b1a83e6c898ca7ad9015568282acbbdb 100644 (file)
--- a/src/test/ui/std-uncopyable-atomics.nll.stderr
+++ b/src/test/ui/std-uncopyable-atomics.nll.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of borrowed content
-  --> $DIR/std-uncopyable-atomics.rs:19:13
+  --> $DIR/std-uncopyable-atomics.rs:9:13
    |
 LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             ^^^
@@ -7,17 +7,8 @@ LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             cannot move out of borrowed content
    |             help: consider removing the `*`: `&x`
 
-error[E0507]: cannot move out of data in a `&` reference
-  --> $DIR/std-uncopyable-atomics.rs:19:13
-   |
-LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
-   |             ^^^
-   |             |
-   |             cannot move out of data in a `&` reference
-   |             cannot move
-
 error[E0507]: cannot move out of borrowed content
-  --> $DIR/std-uncopyable-atomics.rs:21:13
+  --> $DIR/std-uncopyable-atomics.rs:11:13
    |
 LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             ^^^
@@ -25,17 +16,8 @@ LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             cannot move out of borrowed content
    |             help: consider removing the `*`: `&x`
 
-error[E0507]: cannot move out of data in a `&` reference
-  --> $DIR/std-uncopyable-atomics.rs:21:13
-   |
-LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
-   |             ^^^
-   |             |
-   |             cannot move out of data in a `&` reference
-   |             cannot move
-
 error[E0507]: cannot move out of borrowed content
-  --> $DIR/std-uncopyable-atomics.rs:23:13
+  --> $DIR/std-uncopyable-atomics.rs:13:13
    |
 LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             ^^^
@@ -43,17 +25,8 @@ LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             cannot move out of borrowed content
    |             help: consider removing the `*`: `&x`
 
-error[E0507]: cannot move out of data in a `&` reference
-  --> $DIR/std-uncopyable-atomics.rs:23:13
-   |
-LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
-   |             ^^^
-   |             |
-   |             cannot move out of data in a `&` reference
-   |             cannot move
-
 error[E0507]: cannot move out of borrowed content
-  --> $DIR/std-uncopyable-atomics.rs:25:13
+  --> $DIR/std-uncopyable-atomics.rs:15:13
    |
 LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             ^^^
@@ -61,15 +34,6 @@ LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
    |             cannot move out of borrowed content
    |             help: consider removing the `*`: `&x`
 
-error[E0507]: cannot move out of data in a `&` reference
-  --> $DIR/std-uncopyable-atomics.rs:25:13
-   |
-LL |     let x = *&x; //~ ERROR: cannot move out of borrowed content
-   |             ^^^
-   |             |
-   |             cannot move out of data in a `&` reference
-   |             cannot move
-
-error: aborting due to 8 previous errors
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0507`.