-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #83757 - sexxi-goose:migrations_out, r=nikomatsakis
2229: Support migration via rustfix - Adds support of machine applicable suggestions for `disjoint_capture_drop_reorder`. - Doesn't migrate in the case of pre-existing bugs in user code r? ``@nikomatsakis``
- Loading branch information
Showing
13 changed files
with
721 additions
and
136 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
133 changes: 133 additions & 0 deletions
133
src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.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,133 @@ | ||
| // run-rustfix | ||
|
|
||
| #![deny(disjoint_capture_drop_reorder)] | ||
| //~^ NOTE: the lint level is defined here | ||
|
|
||
| // Test cases for types that implement a insignificant drop (stlib defined) | ||
|
|
||
| // `t` needs Drop because one of its elements needs drop, | ||
| // therefore precise capture might affect drop ordering | ||
| fn test1_all_need_migration() { | ||
| let t = (String::new(), String::new()); | ||
| let t1 = (String::new(), String::new()); | ||
| let t2 = (String::new(), String::new()); | ||
|
|
||
| let c = || { let _ = (&t, &t1, &t2); | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t`, `t1`, `t2` to be fully captured | ||
|
|
||
| let _t = t.0; | ||
| let _t1 = t1.0; | ||
| let _t2 = t2.0; | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| // String implements drop and therefore should be migrated. | ||
| // But in this test cases, `t2` is completely captured and when it is dropped won't be affected | ||
| fn test2_only_precise_paths_need_migration() { | ||
| let t = (String::new(), String::new()); | ||
| let t1 = (String::new(), String::new()); | ||
| let t2 = (String::new(), String::new()); | ||
|
|
||
| let c = || { let _ = (&t, &t1); | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t`, `t1` to be fully captured | ||
| let _t = t.0; | ||
| let _t1 = t1.0; | ||
| let _t2 = t2; | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| // If a variable would've not been captured by value then it would've not been | ||
| // dropped with the closure and therefore doesn't need migration. | ||
| fn test3_only_by_value_need_migration() { | ||
| let t = (String::new(), String::new()); | ||
| let t1 = (String::new(), String::new()); | ||
| let c = || { let _ = &t; | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t` to be fully captured | ||
| let _t = t.0; | ||
| println!("{}", t1.1); | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| // Copy types get copied into the closure instead of move. Therefore we don't need to | ||
| // migrate then as their drop order isn't tied to the closure. | ||
| fn test4_only_non_copy_types_need_migration() { | ||
| let t = (String::new(), String::new()); | ||
|
|
||
| // `t1` is Copy because all of its elements are Copy | ||
| let t1 = (0i32, 0i32); | ||
|
|
||
| let c = || { let _ = &t; | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t` to be fully captured | ||
| let _t = t.0; | ||
| let _t1 = t1.0; | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| fn test5_only_drop_types_need_migration() { | ||
| struct S(i32, i32); | ||
|
|
||
| let t = (String::new(), String::new()); | ||
|
|
||
| // `s` doesn't implement Drop or any elements within it, and doesn't need migration | ||
| let s = S(0i32, 0i32); | ||
|
|
||
| let c = || { let _ = &t; | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t` to be fully captured | ||
| let _t = t.0; | ||
| let _s = s.0; | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| // Since we are using a move closure here, both `t` and `t1` get moved | ||
| // even though they are being used by ref inside the closure. | ||
| fn test6_move_closures_non_copy_types_might_need_migration() { | ||
| let t = (String::new(), String::new()); | ||
| let t1 = (String::new(), String::new()); | ||
| let c = move || { let _ = (&t1, &t); | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t1`, `t` to be fully captured | ||
| println!("{} {}", t1.1, t.1); | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| // Test migration analysis in case of Drop + Non Drop aggregates. | ||
| // Note we need migration here only because the non-copy (because Drop type) is captured, | ||
| // otherwise we won't need to, since we can get away with just by ref capture in that case. | ||
| fn test7_drop_non_drop_aggregate_need_migration() { | ||
| let t = (String::new(), String::new(), 0i32); | ||
|
|
||
| let c = || { let _ = &t; | ||
| //~^ ERROR: drop order affected for closure because of `capture_disjoint_fields` | ||
| //~| HELP: add a dummy let to cause `t` to be fully captured | ||
| let _t = t.0; | ||
| }; | ||
|
|
||
| c(); | ||
| } | ||
|
|
||
| fn main() { | ||
| test1_all_need_migration(); | ||
| test2_only_precise_paths_need_migration(); | ||
| test3_only_by_value_need_migration(); | ||
| test4_only_non_copy_types_need_migration(); | ||
| test5_only_drop_types_need_migration(); | ||
| test6_move_closures_non_copy_types_might_need_migration(); | ||
| test7_drop_non_drop_aggregate_need_migration(); | ||
| } |
Oops, something went wrong.