user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #54188 - lqd:fallout-53695, r=nikomatsakis

Browse source 
NLL: disallow creation of immediately unusable variables

Fix #53695

Original description follows

----

This WIP PR is for discussing the impact of fixing #53695 by injecting a fake read in let patterns.

(Travis will fail, at least the `mir-opt` suite is failing in its current state)
This commit is contained in:
bors 2018-09-22 20:38:19 +00:00
commit 4591a245c7
52 changed files with 185 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/test/ui/extern/extern-const.fixed vendored
View file

@ -1,25 +0,0 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// run-rustfix
// compile-flags: -Z continue-parse-after-error
extern "C" {
static C: u8; //~ ERROR extern items cannot be `const`
}
fn main() {
// We suggest turning the (illegal) extern `const` into an extern `static`,
// but this also requires `unsafe` (a deny-by-default lint at comment time,
// future error; Issue #36247)
unsafe {
let _x = C;
}
}

2
src/test/ui/extern/extern-const.rs vendored
View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// run-rustfix
// FIXME(#54388): re-enable rustfix later, when this test has consistent output across targets
// compile-flags: -Z continue-parse-after-error
extern "C" {

5
src/test/ui/generator/borrowing.nll.stderr
View file

@ -10,6 +10,9 @@ LL | };
error[E0597]: `a` does not live long enough
--> $DIR/borrowing.rs:24:9
|
LL | let _b = {
| -- borrow later stored here
LL | let a = 3;
LL | / || {
LL | | yield &a
LL | | //~^ ERROR: `a` does not live long enough
@ -17,8 +20,6 @@ LL | | }
| |_________^ borrowed value does not live long enough
LL | };
| - `a` dropped here while still borrowed
LL | }
| - borrow later used here, when `_b` is dropped
error: aborting due to 2 previous errors

5
src/test/ui/regions/regions-steal-closure.nll.stderr
View file

@ -1,14 +1,15 @@
error[E0597]: `i` does not live long enough
--> $DIR/regions-steal-closure.rs:24:28
|
LL | let mut cl_box = {
| ---------- borrow later stored here
LL | let mut i = 3;
LL | box_it(Box::new(|| i += 1)) //~ ERROR `i` does not live long enough
| -- ^ borrowed value does not live long enough
| |
| value captured here
LL | };
| - `i` dropped here while still borrowed
LL | cl_box.cl.call_mut(());
| --------- borrow later used here
error: aborting due to previous error

12
src/test/ui/span/range-2.nll.stderr
View file

@ -1,24 +1,24 @@
error[E0597]: `a` does not live long enough
--> $DIR/range-2.rs:17:9
|
LL | let r = {
| - borrow later stored here
...
LL | &a..&b
| ^^ borrowed value does not live long enough
LL | };
| - `a` dropped here while still borrowed
...
LL | r.use_ref();
| - borrow later used here
error[E0597]: `b` does not live long enough
--> $DIR/range-2.rs:17:13
|
LL | let r = {
| - borrow later stored here
...
LL | &a..&b
| ^^ borrowed value does not live long enough
LL | };
| - `b` dropped here while still borrowed
...
LL | r.use_ref();
| - borrow later used here
error: aborting due to 2 previous errors

12
src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr
View file

@ -1,18 +1,21 @@
error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-ensures-scoping.rs:26:17
|
LL | let bad = {
| --- borrow later stored here
LL | let x = 1;
LL | let y = &x;
| ^^ borrowed value does not live long enough
...
LL | };
| - `x` dropped here while still borrowed
LL |
LL | bad.join();
| --- borrow later used here
error[E0597]: `y` does not live long enough
--> $DIR/send-is-not-static-ensures-scoping.rs:30:22
|
LL | let bad = {
| --- borrow later stored here
...
LL | scoped(|| {
| -- value captured here
LL | let _z = y;
@ -20,9 +23,6 @@ LL | let _z = y;
...
LL | };
| - `y` dropped here while still borrowed
LL |
LL | bad.join();
| --- borrow later used here
error: aborting due to 2 previous errors

12
src/test/ui/span/send-is-not-static-std-sync-2.nll.stderr
View file

@ -1,24 +1,24 @@
error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-std-sync-2.rs:21:20
|
LL | let lock = {
| ---- borrow later stored here
LL | let x = 1;
LL | Mutex::new(&x)
| ^^ borrowed value does not live long enough
LL | };
| - `x` dropped here while still borrowed
...
LL | let _dangling = *lock.lock().unwrap();
| ---- borrow later used here
error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-std-sync-2.rs:31:21
|
LL | let lock = {
| ---- borrow later stored here
LL | let x = 1;
LL | RwLock::new(&x)
| ^^ borrowed value does not live long enough
LL | };
| - `x` dropped here while still borrowed
LL | //~^^ ERROR `x` does not live long enough
LL | let _dangling = *lock.read().unwrap();
| ---- borrow later used here
error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-std-sync-2.rs:41:25

6
src/test/ui/span/wf-method-late-bound-regions.nll.stderr
View file

@ -1,13 +1,13 @@
error[E0597]: `pointer` does not live long enough
--> $DIR/wf-method-late-bound-regions.rs:30:18
|
LL | let dangling = {
| -------- borrow later stored here
LL | let pointer = Box::new(42);
LL | f2.xmute(&pointer)
| ^^^^^^^^ borrowed value does not live long enough
LL | };
| - `pointer` dropped here while still borrowed
LL | //~^^ ERROR `pointer` does not live long enough
LL | println!("{}", dangling);
| -------- borrow later used here
error: aborting due to previous error

5
src/test/ui/unboxed-closures/unboxed-closure-region.nll.stderr
View file

@ -1,14 +1,15 @@
error[E0597]: `x` does not live long enough
--> $DIR/unboxed-closure-region.rs:18:12
|
LL | let _f = {
| -- borrow later stored here
LL | let x = 0;
LL | || x //~ ERROR `x` does not live long enough
| -- ^ borrowed value does not live long enough
| |
| value captured here
LL | };
| - `x` dropped here while still borrowed
LL | _f;
| -- borrow later used here
error: aborting due to previous error