diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2021-02-02 12:14:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 12:14:44 +0100 |
| commit | a1887912e8a9dc3c190814d27ba00f5f488c6cd3 (patch) | |
| tree | b30c30a72590059bc19f1e5d159d7031958a7404 /src/test/ui/nll | |
| parent | d60b29d1ae8147538b8d542f7ffcc03b48e2cbda (diff) | |
| parent | 84f0a0a1c6627e83408d1faf46e29d29d2bc13e9 (diff) | |
| download | rust-a1887912e8a9dc3c190814d27ba00f5f488c6cd3.tar.gz rust-a1887912e8a9dc3c190814d27ba00f5f488c6cd3.zip | |
Rollup merge of #80629 - sexxi-goose:migrations_1, r=nikomatsakis
Add lint for 2229 migrations Implements the first for RFC 2229 where we make the decision to migrate a root variable based on if the type of the variable needs Drop and if the root variable would be moved into the closure when the feature isn't enabled. r? `@nikomatsakis`
Diffstat (limited to 'src/test/ui/nll')
| -rw-r--r-- | src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr index 1a825837614..e1b446fc61f 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr @@ -7,10 +7,10 @@ LL | let mut closure1 = || p = &y; = note: defining type: test::{closure#0}::{closure#0} with closure substs [ i16, extern "rust-call" fn(()), - (&'_#1r i32, &'_#2r mut &'_#3r i32), + (&'_#1r mut &'_#2r i32, &'_#3r i32), ] = note: number of external vids: 4 - = note: where '_#1r: '_#3r + = note: where '_#3r: '_#2r note: external requirements --> $DIR/escape-upvar-nested.rs:20:27 @@ -25,10 +25,10 @@ LL | | }; = note: defining type: test::{closure#0} with closure substs [ i16, extern "rust-call" fn(()), - (&'_#1r i32, &'_#2r mut &'_#3r i32), + (&'_#1r mut &'_#2r i32, &'_#3r i32), ] = note: number of external vids: 4 - = note: where '_#1r: '_#3r + = note: where '_#3r: '_#2r note: no external requirements --> $DIR/escape-upvar-nested.rs:13:1 diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr index 29fd796882b..0ea1076c32e 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr @@ -7,10 +7,10 @@ LL | let mut closure = || p = &y; = note: defining type: test::{closure#0} with closure substs [ i16, extern "rust-call" fn(()), - (&'_#1r i32, &'_#2r mut &'_#3r i32), + (&'_#1r mut &'_#2r i32, &'_#3r i32), ] = note: number of external vids: 4 - = note: where '_#1r: '_#3r + = note: where '_#3r: '_#2r note: no external requirements --> $DIR/escape-upvar-ref.rs:17:1 |