-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #57202 - matthewjasper:nll-typeck-promoteds, r=pnkfelix
Include bounds from promoted constants in NLL Previously a promoted function wouldn't have its bound propagated out to the main function body. When we visit a promoted, we now type check the MIR of the promoted and transfer any lifetime constraints to back to the main function's MIR. Fixes #57170 r? @nikomatsakis
- Loading branch information
Showing
12 changed files
with
229 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,12 @@ | ||
// Regression test for #48697 | ||
|
||
// compile-pass | ||
|
||
#![feature(nll)] | ||
|
||
fn foo(x: &i32) -> &i32 { | ||
let z = 4; | ||
let f = &|y| y; | ||
let k = f(&z); | ||
f(x) | ||
f(x) //~ cannot return value referencing local variable | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
error[E0515]: cannot return value referencing local variable `z` | ||
--> $DIR/issue-48697.rs:9:5 | ||
| | ||
LL | let k = f(&z); | ||
| -- `z` is borrowed here | ||
LL | f(x) //~ cannot return value referencing local variable | ||
| ^^^^ returns a value referencing data owned by the current function | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0515`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#![feature(nll)] | ||
|
||
fn shorten_lifetime<'a, 'b, 'min>(a: &'a i32, b: &'b i32) -> &'min i32 | ||
where | ||
'a: 'min, | ||
'b: 'min, | ||
{ | ||
if *a < *b { | ||
&a | ||
} else { | ||
&b | ||
} | ||
} | ||
|
||
fn main() { | ||
let promoted_fn_item_ref = &shorten_lifetime; | ||
|
||
let a = &5; | ||
let ptr = { | ||
let l = 3; | ||
let b = &l; //~ ERROR does not live long enough | ||
let c = promoted_fn_item_ref(a, b); | ||
c | ||
}; | ||
|
||
println!("ptr = {:?}", ptr); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
error[E0597]: `l` does not live long enough | ||
--> $DIR/promoted-bounds.rs:21:17 | ||
| | ||
LL | let ptr = { | ||
| --- borrow later stored here | ||
LL | let l = 3; | ||
LL | let b = &l; //~ ERROR does not live long enough | ||
| ^^ borrowed value does not live long enough | ||
... | ||
LL | }; | ||
| - `l` dropped here while still borrowed | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0597`. |
Oops, something went wrong.