diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-26 17:19:03 +0200 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-26 17:19:03 +0200 |
| commit | 5a0e4613ce62f1e46f974af4065e5ccb3f56a1af (patch) | |
| tree | 3419f8c95222d6bf13e028df11841c726ef3f291 | |
| parent | 9a2cc54e11e919acf83827609ed0fb0d07bf0778 (diff) | |
| download | rust-5a0e4613ce62f1e46f974af4065e5ccb3f56a1af.tar.gz rust-5a0e4613ce62f1e46f974af4065e5ccb3f56a1af.zip | |
issue-#45696: remove ignore-compare-mode-nll
3 files changed, 6 insertions, 10 deletions
diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr index 45b22511d27..db0a1719922 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr @@ -1,33 +1,30 @@ error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:52:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:34:5 | LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 { | -- lifetime `'a` defined here LL | &mut *s.0 | ^^^^^^^^^ returning this value requires that `*s.0` is borrowed for `'a` -... LL | } | - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:63:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:39:5 | LL | fn boxed_scribbled<'a>(s: Box<Scribble<'a>>) -> &'a mut u32 { | -- lifetime `'a` defined here LL | &mut *(*s).0 | ^^^^^^^^^^^^ returning this value requires that `*s.0` is borrowed for `'a` -... LL | } | - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:74:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:44:5 | LL | fn boxed_boxed_scribbled<'a>(s: Box<Box<Scribble<'a>>>) -> &'a mut u32 { | -- lifetime `'a` defined here LL | &mut *(**s).0 | ^^^^^^^^^^^^^ returning this value requires that `*s.0` is borrowed for `'a` -... LL | } | - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs index e9daf39262c..637cf278f84 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs @@ -2,7 +2,6 @@ // mutable borrows that would be scribbled over by destructors before // the return occurs. -// ignore-compare-mode-nll // ignore-compare-mode-polonius struct Scribble<'a>(&'a mut u32); diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.stderr index 18aa38899cb..db0a1719922 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.stderr +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.stderr @@ -1,5 +1,5 @@ error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:35:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:34:5 | LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 { | -- lifetime `'a` defined here @@ -9,7 +9,7 @@ LL | } | - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:40:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:39:5 | LL | fn boxed_scribbled<'a>(s: Box<Scribble<'a>>) -> &'a mut u32 { | -- lifetime `'a` defined here @@ -19,7 +19,7 @@ LL | } | - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:45:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:44:5 | LL | fn boxed_boxed_scribbled<'a>(s: Box<Box<Scribble<'a>>>) -> &'a mut u32 { | -- lifetime `'a` defined here |