about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-05-10 12:41:24 -0300
committerNiko Matsakis <niko@alum.mit.edu>2018-05-10 12:41:24 -0300
commit6189602bb84019b25ab8f1f5287c366ba50d0e66 (patch)
tree140ee8bc7749bb9c39d0de32c77efa4cc5a68714 /src
parent72c235d6aea713d233fa1536b344c59b93c28295 (diff)
downloadrust-6189602bb84019b25ab8f1f5287c366ba50d0e66.tar.gz
rust-6189602bb84019b25ab8f1f5287c366ba50d0e66.zip
fix nll reference harder
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/nll/get_default.nll.stderr28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/test/ui/nll/get_default.nll.stderr b/src/test/ui/nll/get_default.nll.stderr
index dd69e18652c..b955a51e38d 100644
--- a/src/test/ui/nll/get_default.nll.stderr
+++ b/src/test/ui/nll/get_default.nll.stderr
@@ -41,7 +41,7 @@ LL |         match map.get() {
    |               --- immutable borrow occurs here
 ...
 LL |                 map.set(String::new()); // Ideally, this would not error.
-   |                 ^^^ mutable borrow occurs here
+   |                 ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
    |
 note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 26:1...
   --> $DIR/get_default.rs:26:1
@@ -56,13 +56,25 @@ LL | | }
    | |_^
 
 error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir)
+  --> $DIR/get_default.rs:45:17
+   |
+LL |         match map.get() {
+   |               --- immutable borrow occurs here
+LL |             Some(v) => {
+LL |                 map.set(String::new()); // Both AST and MIR error here
+   |                 ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
+...
+LL |                 return v;
+   |                        - borrow later used here
+
+error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir)
   --> $DIR/get_default.rs:51:17
    |
 LL |         match map.get() {
    |               --- immutable borrow occurs here
 ...
 LL |                 map.set(String::new()); // Ideally, just AST would error here
-   |                 ^^^ mutable borrow occurs here
+   |                 ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
    |
 note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 41:1...
   --> $DIR/get_default.rs:41:1
@@ -76,18 +88,6 @@ LL | |     }
 LL | | }
    | |_^
 
-error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir)
-  --> $DIR/get_default.rs:45:17
-   |
-LL |         match map.get() {
-   |               --- immutable borrow occurs here
-LL |             Some(v) => {
-LL |                 map.set(String::new()); // Both AST and MIR error here
-   |                 ^^^ mutable borrow occurs here
-...
-LL |                 return v;
-   |                        - borrow later used here
-
 error: aborting due to 6 previous errors
 
 For more information about this error, try `rustc --explain E0502`.