Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2

[rust.git] / tests / ui / mut_mut.stderr

diff --git a/tests/ui/mut_mut.stderr b/tests/ui/mut_mut.stderr
index d1f05ea8091fb448256b00b93d7d95367a489ddb..44e81422714181250edb7b3338c7d4cf3e7fe7c8 100644 (file)
--- a/tests/ui/mut_mut.stderr
+++ b/tests/ui/mut_mut.stderr
@@ -1,61 +1,63 @@
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:10:12
+  --> $DIR/mut_mut.rs:4:11
    |
-10 | fn fun(x : &mut &mut u32) -> bool {
-   |            ^^^^^^^^^^^^^
+LL | fn fun(x: &mut &mut u32) -> bool {
+   |           ^^^^^^^^^^^^^
    |
-   = note: `-D mut-mut` implied by `-D warnings`
+   = note: `-D clippy::mut-mut` implied by `-D warnings`
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:24:17
+  --> $DIR/mut_mut.rs:20:17
    |
-24 |     let mut x = &mut &mut 1u32;
+LL |     let mut x = &mut &mut 1u32;
    |                 ^^^^^^^^^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:19:20
+  --> $DIR/mut_mut.rs:14:9
    |
-19 |     ($p:expr) => { &mut $p }
-   |                    ^^^^^^^
+LL |         &mut $p
+   |         ^^^^^^^
 ...
-39 |     let mut z = mut_ptr!(&mut 3u32);
+LL |     let mut z = mut_ptr!(&mut 3u32);
    |                 ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: this expression mutably borrows a mutable reference. Consider reborrowing
-  --> $DIR/mut_mut.rs:26:21
+  --> $DIR/mut_mut.rs:22:21
    |
-26 |         let mut y = &mut x;
+LL |         let mut y = &mut x;
    |                     ^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:30:33
+  --> $DIR/mut_mut.rs:26:32
    |
-30 |         let y : &mut &mut u32 = &mut &mut 2;
-   |                                 ^^^^^^^^^^^
+LL |         let y: &mut &mut u32 = &mut &mut 2;
+   |                                ^^^^^^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:30:17
+  --> $DIR/mut_mut.rs:26:16
    |
-30 |         let y : &mut &mut u32 = &mut &mut 2;
-   |                 ^^^^^^^^^^^^^
+LL |         let y: &mut &mut u32 = &mut &mut 2;
+   |                ^^^^^^^^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:35:38
+  --> $DIR/mut_mut.rs:31:37
    |
-35 |         let y : &mut &mut &mut u32 = &mut &mut &mut 2;
-   |                                      ^^^^^^^^^^^^^^^^
+LL |         let y: &mut &mut &mut u32 = &mut &mut &mut 2;
+   |                                     ^^^^^^^^^^^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:35:17
+  --> $DIR/mut_mut.rs:31:16
    |
-35 |         let y : &mut &mut &mut u32 = &mut &mut &mut 2;
-   |                 ^^^^^^^^^^^^^^^^^^
+LL |         let y: &mut &mut &mut u32 = &mut &mut &mut 2;
+   |                ^^^^^^^^^^^^^^^^^^
 
 error: generally you want to avoid `&mut &mut _` if possible
-  --> $DIR/mut_mut.rs:35:22
+  --> $DIR/mut_mut.rs:31:21
    |
-35 |         let y : &mut &mut &mut u32 = &mut &mut &mut 2;
-   |                      ^^^^^^^^^^^^^
+LL |         let y: &mut &mut &mut u32 = &mut &mut &mut 2;
+   |                     ^^^^^^^^^^^^^
 
 error: aborting due to 9 previous errors