bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update error message

Browse source
This commit is contained in:
Roxane 2021-07-06 16:49:07 -04:00
parent 0b7ff9660f
commit 0e8e89daa6
12 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_typeck/src/check/upvar.rs
View file

@ -505,7 +505,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|lint| { |lint| {
let mut diagnostics_builder = lint.build( let mut diagnostics_builder = lint.build(
format!( format!(
"{} will change in Rust 2021", "changes to closure capture in Rust 2021 will affect {}",
reasons reasons
) )
.as_str(), .as_str(),
@ -567,7 +567,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if auto_trait_reasons.len() > 0 { if auto_trait_reasons.len() > 0 {
reasons = format!( reasons = format!(
"{} trait implementation", "{} closure trait implementation",
auto_trait_reasons.clone().into_iter().collect::<Vec<&str>>().join(", ") auto_trait_reasons.clone().into_iter().collect::<Vec<&str>>().join(", ")
); );
} }

6
src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.fixed
View file

@ -11,7 +11,7 @@ fn test_send_trait() {
let mut f = 10; let mut f = 10;
let fptr = SendPointer(&mut f as *mut i32); let fptr = SendPointer(&mut f as *mut i32);
thread::spawn(move || { let _ = &fptr; unsafe { thread::spawn(move || { let _ = &fptr; unsafe {
//~^ ERROR: `Send` trait implementation //~^ ERROR: `Send` closure trait implementation
//~| HELP: add a dummy let to cause `fptr` to be fully captured //~| HELP: add a dummy let to cause `fptr` to be fully captured
*fptr.0 = 20; *fptr.0 = 20;
} }); } });
@ -28,7 +28,7 @@ fn test_sync_trait() {
let f = CustomInt(&mut f as *mut i32); let f = CustomInt(&mut f as *mut i32);
let fptr = SyncPointer(f); let fptr = SyncPointer(f);
thread::spawn(move || { let _ = &fptr; unsafe { thread::spawn(move || { let _ = &fptr; unsafe {
//~^ ERROR: `Sync`, `Send` trait implementation //~^ ERROR: `Sync`, `Send` closure trait implementation
//~| HELP: add a dummy let to cause `fptr` to be fully captured //~| HELP: add a dummy let to cause `fptr` to be fully captured
*fptr.0.0 = 20; *fptr.0.0 = 20;
} }); } });
@ -49,7 +49,7 @@ impl Clone for U {
fn test_clone_trait() { fn test_clone_trait() {
let f = U(S(String::from("Hello World")), T(0)); let f = U(S(String::from("Hello World")), T(0));
let c = || { let _ = &f; let c = || { let _ = &f;
//~^ ERROR: `Clone` trait implementation, and drop order //~^ ERROR: `Clone` closure trait implementation, and drop order
//~| HELP: add a dummy let to cause `f` to be fully captured //~| HELP: add a dummy let to cause `f` to be fully captured
let f_1 = f.1; let f_1 = f.1;
println!("{:?}", f_1.0); println!("{:?}", f_1.0);

6
src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.rs
View file

@ -11,7 +11,7 @@ fn test_send_trait() {
let mut f = 10; let mut f = 10;
let fptr = SendPointer(&mut f as *mut i32); let fptr = SendPointer(&mut f as *mut i32);
thread::spawn(move || unsafe { thread::spawn(move || unsafe {
//~^ ERROR: `Send` trait implementation //~^ ERROR: `Send` closure trait implementation
//~| HELP: add a dummy let to cause `fptr` to be fully captured //~| HELP: add a dummy let to cause `fptr` to be fully captured
*fptr.0 = 20; *fptr.0 = 20;
}); });
@ -28,7 +28,7 @@ fn test_sync_trait() {
let f = CustomInt(&mut f as *mut i32); let f = CustomInt(&mut f as *mut i32);
let fptr = SyncPointer(f); let fptr = SyncPointer(f);
thread::spawn(move || unsafe { thread::spawn(move || unsafe {
//~^ ERROR: `Sync`, `Send` trait implementation //~^ ERROR: `Sync`, `Send` closure trait implementation
//~| HELP: add a dummy let to cause `fptr` to be fully captured //~| HELP: add a dummy let to cause `fptr` to be fully captured
*fptr.0.0 = 20; *fptr.0.0 = 20;
}); });
@ -49,7 +49,7 @@ impl Clone for U {
fn test_clone_trait() { fn test_clone_trait() {
let f = U(S(String::from("Hello World")), T(0)); let f = U(S(String::from("Hello World")), T(0));
let c = || { let c = || {
//~^ ERROR: `Clone` trait implementation, and drop order //~^ ERROR: `Clone` closure trait implementation, and drop order
//~| HELP: add a dummy let to cause `f` to be fully captured //~| HELP: add a dummy let to cause `f` to be fully captured
let f_1 = f.1; let f_1 = f.1;
println!("{:?}", f_1.0); println!("{:?}", f_1.0);

6
src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr
View file

@ -1,4 +1,4 @@
error: `Send` trait implementation will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect `Send` closure trait implementation
--> $DIR/auto_traits.rs:13:19 --> $DIR/auto_traits.rs:13:19
| |
LL | thread::spawn(move || unsafe { LL | thread::spawn(move || unsafe {
@ -25,7 +25,7 @@ LL | *fptr.0 = 20;
LL | } }); LL | } });
| |
error: `Sync`, `Send` trait implementation will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect `Sync`, `Send` closure trait implementation
--> $DIR/auto_traits.rs:30:19 --> $DIR/auto_traits.rs:30:19
| |
LL | thread::spawn(move || unsafe { LL | thread::spawn(move || unsafe {
@ -47,7 +47,7 @@ LL | *fptr.0.0 = 20;
LL | } }); LL | } });
| |
error: `Clone` trait implementation, and drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect `Clone` closure trait implementation, and drop order
--> $DIR/auto_traits.rs:51:13 --> $DIR/auto_traits.rs:51:13
| |
LL | let c = || { LL | let c = || {

14
src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.stderr
View file

@ -1,4 +1,4 @@
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:15:13 --> $DIR/insignificant_drop.rs:15:13
| |
LL | let c = || { LL | let c = || {
@ -35,7 +35,7 @@ LL |
LL | let _t = t.0; LL | let _t = t.0;
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:38:13 --> $DIR/insignificant_drop.rs:38:13
| |
LL | let c = || { LL | let c = || {
@ -64,7 +64,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:57:13 --> $DIR/insignificant_drop.rs:57:13
| |
LL | let c = || { LL | let c = || {
@ -90,7 +90,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:77:13 --> $DIR/insignificant_drop.rs:77:13
| |
LL | let c = || { LL | let c = || {
@ -116,7 +116,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:97:13 --> $DIR/insignificant_drop.rs:97:13
| |
LL | let c = || { LL | let c = || {
@ -142,7 +142,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:114:13 --> $DIR/insignificant_drop.rs:114:13
| |
LL | let c = move || { LL | let c = move || {
@ -170,7 +170,7 @@ LL | println!("{} {}", t1.1, t.1);
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop.rs:132:13 --> $DIR/insignificant_drop.rs:132:13
| |
LL | let c = || { LL | let c = || {

4
src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr
View file

@ -1,4 +1,4 @@
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop_attr_migrations.rs:37:13 --> $DIR/insignificant_drop_attr_migrations.rs:37:13
| |
LL | let c = || { LL | let c = || {
@ -28,7 +28,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/insignificant_drop_attr_migrations.rs:56:13 --> $DIR/insignificant_drop_attr_migrations.rs:56:13
| |
LL | let c = move || { LL | let c = move || {

4
src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr
View file

@ -1,4 +1,4 @@
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/migrations_rustfix.rs:19:13 --> $DIR/migrations_rustfix.rs:19:13
| |
LL | let c = || { LL | let c = || {
@ -29,7 +29,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/migrations_rustfix.rs:33:13 --> $DIR/migrations_rustfix.rs:33:13
| |
LL | let c = || t.0; LL | let c = || t.0;

2
src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed
View file

@ -17,7 +17,7 @@ where
{ {
let f = panic::AssertUnwindSafe(f); let f = panic::AssertUnwindSafe(f);
let result = panic::catch_unwind(move || { let _ = &f; let result = panic::catch_unwind(move || { let _ = &f;
//~^ ERROR: `UnwindSafe`, `RefUnwindSafe` trait implementation //~^ ERROR: `UnwindSafe`, `RefUnwindSafe` closure trait implementation
//~| HELP: add a dummy let to cause `f` to be fully captured //~| HELP: add a dummy let to cause `f` to be fully captured
f.0() f.0()
}); });

2
src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs
View file

@ -17,7 +17,7 @@ where
{ {
let f = panic::AssertUnwindSafe(f); let f = panic::AssertUnwindSafe(f);
let result = panic::catch_unwind(move || { let result = panic::catch_unwind(move || {
//~^ ERROR: `UnwindSafe`, `RefUnwindSafe` trait implementation //~^ ERROR: `UnwindSafe`, `RefUnwindSafe` closure trait implementation
//~| HELP: add a dummy let to cause `f` to be fully captured //~| HELP: add a dummy let to cause `f` to be fully captured
f.0() f.0()
}); });

2
src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr
View file

@ -1,4 +1,4 @@
error: `UnwindSafe`, `RefUnwindSafe` trait implementation will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect `UnwindSafe`, `RefUnwindSafe` closure trait implementation
--> $DIR/mir_calls_to_shims.rs:19:38 --> $DIR/mir_calls_to_shims.rs:19:38
| |
LL | let result = panic::catch_unwind(move || { LL | let result = panic::catch_unwind(move || {

4
src/test/ui/closures/2229_closure_analysis/migrations/precise.stderr
View file

@ -1,4 +1,4 @@
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/precise.rs:19:13 --> $DIR/precise.rs:19:13
| |
LL | let c = || { LL | let c = || {
@ -27,7 +27,7 @@ LL | let _t = &t.1;
LL | }; LL | };
| |
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/precise.rs:41:13 --> $DIR/precise.rs:41:13
| |
LL | let c = || { LL | let c = || {

14
src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.stderr
View file

@ -1,4 +1,4 @@
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:25:13 --> $DIR/significant_drop.rs:25:13
| |
LL | let c = || { LL | let c = || {
@ -34,7 +34,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:47:13 --> $DIR/significant_drop.rs:47:13
| |
LL | let c = || { LL | let c = || {
@ -63,7 +63,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:66:13 --> $DIR/significant_drop.rs:66:13
| |
LL | let c = || { LL | let c = || {
@ -89,7 +89,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:85:13 --> $DIR/significant_drop.rs:85:13
| |
LL | let c = || { LL | let c = || {
@ -114,7 +114,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:102:13 --> $DIR/significant_drop.rs:102:13
| |
LL | let c = || { LL | let c = || {
@ -139,7 +139,7 @@ LL | let _t = t.0;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:117:13 --> $DIR/significant_drop.rs:117:13
| |
LL | let c = || { LL | let c = || {
@ -164,7 +164,7 @@ LL | let _t = t.1;
LL | LL |
... ...
error: drop order will change in Rust 2021 error: changes to closure capture in Rust 2021 will affect drop order
--> $DIR/significant_drop.rs:134:13 --> $DIR/significant_drop.rs:134:13
| |
LL | let c = move || { LL | let c = move || {