mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-06 12:18:33 +00:00
Rollup merge of #138470 - spastorino:test-rfc2229-and-ergonomic-clones, r=nikomatsakis
Test interaction between RFC 2229 migration and use closures r? `@nikomatsakis` Fixes #138101
This commit is contained in:
commit
2b28e6be5a
26
tests/ui/ergonomic-clones/closure/rfc2229-migration.fixed
Normal file
26
tests/ui/ergonomic-clones/closure/rfc2229-migration.fixed
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
//@ run-rustfix
|
||||||
|
//@ edition:2018
|
||||||
|
//@ check-pass
|
||||||
|
#![feature(ergonomic_clones)]
|
||||||
|
#![warn(rust_2021_compatibility)]
|
||||||
|
#![allow(incomplete_features)]
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct Foo(i32);
|
||||||
|
impl Drop for Foo {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
println!("{:?} dropped", self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let a = (Foo(0), Foo(1));
|
||||||
|
let f = use || {
|
||||||
|
let _ = &a;
|
||||||
|
//~^ HELP: add a dummy
|
||||||
|
//~| WARNING: drop order
|
||||||
|
let x = a.0;
|
||||||
|
println!("{:?}", x);
|
||||||
|
};
|
||||||
|
f();
|
||||||
|
}
|
25
tests/ui/ergonomic-clones/closure/rfc2229-migration.rs
Normal file
25
tests/ui/ergonomic-clones/closure/rfc2229-migration.rs
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
//@ run-rustfix
|
||||||
|
//@ edition:2018
|
||||||
|
//@ check-pass
|
||||||
|
#![feature(ergonomic_clones)]
|
||||||
|
#![warn(rust_2021_compatibility)]
|
||||||
|
#![allow(incomplete_features)]
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct Foo(i32);
|
||||||
|
impl Drop for Foo {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
println!("{:?} dropped", self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let a = (Foo(0), Foo(1));
|
||||||
|
let f = use || {
|
||||||
|
//~^ HELP: add a dummy
|
||||||
|
//~| WARNING: drop order
|
||||||
|
let x = a.0;
|
||||||
|
println!("{:?}", x);
|
||||||
|
};
|
||||||
|
f();
|
||||||
|
}
|
27
tests/ui/ergonomic-clones/closure/rfc2229-migration.stderr
Normal file
27
tests/ui/ergonomic-clones/closure/rfc2229-migration.stderr
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
warning: changes to closure capture in Rust 2021 will affect drop order
|
||||||
|
--> $DIR/rfc2229-migration.rs:18:13
|
||||||
|
|
|
||||||
|
LL | let f = use || {
|
||||||
|
| ^^^^^^
|
||||||
|
...
|
||||||
|
LL | let x = a.0;
|
||||||
|
| --- in Rust 2018, this closure captures all of `a`, but in Rust 2021, it will only capture `a.0`
|
||||||
|
...
|
||||||
|
LL | }
|
||||||
|
| - in Rust 2018, `a` is dropped here, but in Rust 2021, only `a.0` will be dropped here as part of the closure
|
||||||
|
|
|
||||||
|
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/disjoint-capture-in-closures.html>
|
||||||
|
note: the lint level is defined here
|
||||||
|
--> $DIR/rfc2229-migration.rs:5:9
|
||||||
|
|
|
||||||
|
LL | #![warn(rust_2021_compatibility)]
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
= note: `#[warn(rust_2021_incompatible_closure_captures)]` implied by `#[warn(rust_2021_compatibility)]`
|
||||||
|
help: add a dummy let to cause `a` to be fully captured
|
||||||
|
|
|
||||||
|
LL ~ let f = use || {
|
||||||
|
LL + let _ = &a;
|
||||||
|
|
|
||||||
|
|
||||||
|
warning: 1 warning emitted
|
||||||
|
|
Loading…
Reference in New Issue
Block a user