-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
handle case of a variable not captured
- Loading branch information
1 parent
76bc027
commit fc8113d
Showing
4 changed files
with
117 additions
and
8 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
35 changes: 35 additions & 0 deletions
35
src/test/ui/closures/2229_closure_analysis/issue-90465.fixed
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,35 @@ | ||
// run-rustfix | ||
|
||
#![deny(rust_2021_incompatible_closure_captures)] | ||
//~^ NOTE lint level is defined here | ||
|
||
fn main() { | ||
struct Foo(u32); | ||
impl Drop for Foo { | ||
fn drop(&mut self) { | ||
println!("dropped {}", self.0); | ||
} | ||
} | ||
|
||
let f0 = Foo(0); | ||
let f1 = Foo(1); | ||
|
||
let c0 = move || { | ||
let _ = &f0; | ||
//~^ ERROR changes to closure capture in Rust 2021 will affect drop order | ||
//~| NOTE for more information | ||
let _ = f0; | ||
//~^ NOTE in Rust 2018, this causes the closure to capture `f0`, but in Rust 2021, it has no effect | ||
}; | ||
|
||
let c1 = move || { | ||
let _ = &f1; | ||
}; | ||
|
||
println!("dropping 0"); | ||
drop(c0); | ||
println!("dropping 1"); | ||
drop(c1); | ||
println!("dropped all"); | ||
} | ||
//~^ NOTE in Rust 2018, `f0` is dropped here along with the closure, but in Rust 2021 `f0` is not part of the closure |
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,34 @@ | ||
// run-rustfix | ||
|
||
#![deny(rust_2021_incompatible_closure_captures)] | ||
//~^ NOTE lint level is defined here | ||
|
||
fn main() { | ||
struct Foo(u32); | ||
impl Drop for Foo { | ||
fn drop(&mut self) { | ||
println!("dropped {}", self.0); | ||
} | ||
} | ||
|
||
let f0 = Foo(0); | ||
let f1 = Foo(1); | ||
|
||
let c0 = move || { | ||
//~^ ERROR changes to closure capture in Rust 2021 will affect drop order | ||
//~| NOTE for more information | ||
let _ = f0; | ||
//~^ NOTE in Rust 2018, this causes the closure to capture `f0`, but in Rust 2021, it has no effect | ||
}; | ||
|
||
let c1 = move || { | ||
let _ = &f1; | ||
}; | ||
|
||
println!("dropping 0"); | ||
drop(c0); | ||
println!("dropping 1"); | ||
drop(c1); | ||
println!("dropped all"); | ||
} | ||
//~^ NOTE in Rust 2018, `f0` is dropped here along with the closure, but in Rust 2021 `f0` is not part of the closure |
26 changes: 26 additions & 0 deletions
26
src/test/ui/closures/2229_closure_analysis/issue-90465.stderr
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,26 @@ | ||
error: changes to closure capture in Rust 2021 will affect drop order | ||
--> $DIR/issue-90465.rs:17:14 | ||
| | ||
LL | let c0 = move || { | ||
| ^^^^^^^ | ||
... | ||
LL | let _ = f0; | ||
| -- in Rust 2018, this causes the closure to capture `f0`, but in Rust 2021, it has no effect | ||
... | ||
LL | } | ||
| - in Rust 2018, `f0` is dropped here along with the closure, but in Rust 2021 `f0` is not part of the closure | ||
| | ||
note: the lint level is defined here | ||
--> $DIR/issue-90465.rs:3:9 | ||
| | ||
LL | #![deny(rust_2021_incompatible_closure_captures)] | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/disjoint-capture-in-closures.html> | ||
help: add a dummy let to cause `f0` to be fully captured | ||
| | ||
LL ~ let c0 = move || { | ||
LL + let _ = &f0; | ||
| | ||
|
||
error: aborting due to previous error | ||
|