Update tests for changes to cannot move errors

[rust.git] / src / test / ui / borrowck / borrowck-move-out-of-struct-with-dtor.stderr

diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr
index 059aa3081fce7a4a3ff6934b2b569a638908593b..a2f66f3ec465d4f9aafadff8b50b95e252c0800b 100644 (file)
--- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr
+++ b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.stderr
@@ -5,13 +5,10 @@ LL |     match (S {f:"foo".to_string()}) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here
 LL |
 LL |         S {f:_s} => {}
-   |              -- data moved here
-   |
-note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
-  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:9:14
-   |
-LL |         S {f:_s} => {}
-   |              ^^
+   |              --
+   |              |
+   |              data moved here
+   |              move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
 
 error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
   --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:14:20
@@ -20,12 +17,7 @@ LL |     let S {f:_s} = S {f:"foo".to_string()};
    |              --    ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here
    |              |
    |              data moved here
-   |
-note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
-  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:14:14
-   |
-LL |     let S {f:_s} = S {f:"foo".to_string()};
-   |              ^^
+   |              move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
 
 error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
   --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:19
@@ -34,13 +26,8 @@ LL | fn move_in_fn_arg(S {f:_s}: S) {
    |                   ^^^^^--^
    |                   |    |
    |                   |    data moved here
+   |                   |    move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
    |                   cannot move out of here
-   |
-note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait
-  --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:24
-   |
-LL | fn move_in_fn_arg(S {f:_s}: S) {
-   |                        ^^
 
 error: aborting due to 3 previous errors