Auto merge of #3603 - xfix:random-state-lint, r=phansch

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

diff --git a/tests/ui/mut_from_ref.stderr b/tests/ui/mut_from_ref.stderr
index 509ac83b4dabfcb4ed606cf3ba6dfa5d7828ce73..544d1aa5f14b6347d8b2e3535a564a075c6e2e34 100644 (file)
--- a/tests/ui/mut_from_ref.stderr
+++ b/tests/ui/mut_from_ref.stderr
@@ -1,32 +1,63 @@
-error: this function takes an immutable ref to return a mutable one
- --> $DIR/mut_from_ref.rs:9:39
-  |
-9 |     fn this_wont_hurt_a_bit(&self) -> &mut Foo {
-  |                                       ^^^^^^^^
-  |
-note: lint level defined here
- --> $DIR/mut_from_ref.rs:4:9
-  |
-4 | #![deny(mut_from_ref)]
-  |         ^^^^^^^^^^^^
+error: mutable borrow from immutable input(s)
+  --> $DIR/mut_from_ref.rs:16:39
+   |
+LL |     fn this_wont_hurt_a_bit(&self) -> &mut Foo {
+   |                                       ^^^^^^^^
+   |
+   = note: `-D clippy::mut-from-ref` implied by `-D warnings`
+note: immutable borrow here
+  --> $DIR/mut_from_ref.rs:16:29
+   |
+LL |     fn this_wont_hurt_a_bit(&self) -> &mut Foo {
+   |                             ^^^^^
 
-error: this function takes an immutable ref to return a mutable one
-  --> $DIR/mut_from_ref.rs:15:25
+error: mutable borrow from immutable input(s)
+  --> $DIR/mut_from_ref.rs:22:25
    |
-15 |     fn ouch(x: &Foo) -> &mut Foo;
+LL |     fn ouch(x: &Foo) -> &mut Foo;
    |                         ^^^^^^^^
+   |
+note: immutable borrow here
+  --> $DIR/mut_from_ref.rs:22:16
+   |
+LL |     fn ouch(x: &Foo) -> &mut Foo;
+   |                ^^^^
 
-error: this function takes an immutable ref to return a mutable one
-  --> $DIR/mut_from_ref.rs:24:21
+error: mutable borrow from immutable input(s)
+  --> $DIR/mut_from_ref.rs:31:21
    |
-24 | fn fail(x: &u32) -> &mut u16 {
+LL | fn fail(x: &u32) -> &mut u16 {
    |                     ^^^^^^^^
+   |
+note: immutable borrow here
+  --> $DIR/mut_from_ref.rs:31:12
+   |
+LL | fn fail(x: &u32) -> &mut u16 {
+   |            ^^^^
 
-error: this function takes an immutable ref to return a mutable one
-  --> $DIR/mut_from_ref.rs:28:50
+error: mutable borrow from immutable input(s)
+  --> $DIR/mut_from_ref.rs:35:50
    |
-28 | fn fail_lifetime<'a>(x: &'a u32, y: &mut u32) -> &'a mut u32 {
+LL | fn fail_lifetime<'a>(x: &'a u32, y: &mut u32) -> &'a mut u32 {
    |                                                  ^^^^^^^^^^^
+   |
+note: immutable borrow here
+  --> $DIR/mut_from_ref.rs:35:25
+   |
+LL | fn fail_lifetime<'a>(x: &'a u32, y: &mut u32) -> &'a mut u32 {
+   |                         ^^^^^^^
+
+error: mutable borrow from immutable input(s)
+  --> $DIR/mut_from_ref.rs:39:67
+   |
+LL | fn fail_double<'a, 'b>(x: &'a u32, y: &'a u32, z: &'b mut u32) -> &'a mut u32 {
+   |                                                                   ^^^^^^^^^^^
+   |
+note: immutable borrow here
+  --> $DIR/mut_from_ref.rs:39:27
+   |
+LL | fn fail_double<'a, 'b>(x: &'a u32, y: &'a u32, z: &'b mut u32) -> &'a mut u32 {
+   |                           ^^^^^^^     ^^^^^^^
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors