about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorNiv Kaminer <nivkner@zoho.com>2018-12-17 18:34:04 +0200
committerNiv Kaminer <nivkner@zoho.com>2018-12-19 10:51:47 +0200
commitcc568e7be1ee6fea6e594f8ecd34d4fe05610e8b (patch)
tree2afaaf8eb7bcd6c3f8794d12305f8106d29b5738 /src/test/ui
parent7092fca98465457c7512e313d52a5f92797942da (diff)
downloadrust-cc568e7be1ee6fea6e594f8ecd34d4fe05610e8b.tar.gz
rust-cc568e7be1ee6fea6e594f8ecd34d4fe05610e8b.zip
FIXME(49824) remove fixme because there is no free region error anymore
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr4
-rw-r--r--src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr6
-rw-r--r--src/test/ui/borrowck/borrowck-describe-lvalue.rs1
3 files changed, 5 insertions, 6 deletions
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
index bc6385ffd92..c028b2c4868 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
@@ -220,7 +220,7 @@ LL |         };
    |         - first borrow ends here
 
 error[E0499]: cannot borrow `**x` as mutable more than once at a time
-  --> $DIR/borrowck-describe-lvalue.rs:307:25
+  --> $DIR/borrowck-describe-lvalue.rs:306:25
    |
 LL |                    let y = &mut x;
    |                                 - first mutable borrow occurs here
@@ -231,7 +231,7 @@ LL |                 }
    |                 - first borrow ends here
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-describe-lvalue.rs:318:22
+  --> $DIR/borrowck-describe-lvalue.rs:317:22
    |
 LL |                 drop(x);
    |                      - value moved here
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
index 5721c52ba21..69855cc9841 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
@@ -10,7 +10,7 @@ LL |             *y = 1;
    |             ------ first borrow later used here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-describe-lvalue.rs:307:20
+  --> $DIR/borrowck-describe-lvalue.rs:306:20
    |
 LL |                    let y = &mut x;
    |                            ------ first mutable borrow occurs here
@@ -21,7 +21,7 @@ LL |                    *y = 1;
    |                    ------ first borrow later used here
 
 error: captured variable cannot escape `FnMut` closure body
-  --> $DIR/borrowck-describe-lvalue.rs:305:16
+  --> $DIR/borrowck-describe-lvalue.rs:304:16
    |
 LL |              || {
    |               - inferred to be a `FnMut` closure
@@ -362,7 +362,7 @@ LL |             drop(x);
    |                  - mutable borrow later used here
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-describe-lvalue.rs:318:22
+  --> $DIR/borrowck-describe-lvalue.rs:317:22
    |
 LL |                 drop(x);
    |                      - value moved here
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.rs b/src/test/ui/borrowck/borrowck-describe-lvalue.rs
index 649de888ab0..29f29f106df 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.rs
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.rs
@@ -299,7 +299,6 @@ fn main() {
     }
     // Field from upvar nested
     {
-        // FIXME(#49824) -- the free region error below should probably not be there
         let mut x = 0;
            || {
                || { //[mir]~ ERROR captured variable cannot escape `FnMut` closure body