Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 229 deletions

diff --git a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed b/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed
deleted file mode 100644
index e99dbb5ab..000000000
--- a/src/test/ui/closures/2229_closure_analysis/migrations/significant_drop.fixed
+++ /dev/null
@@ -1,229 +0,0 @@
-// run-rustfix
-#![deny(rust_2021_incompatible_closure_captures)]
-//~^ NOTE: the lint level is defined here
-
-// Test cases for types that implement a significant drop (user defined)
-
-#[derive(Debug)]
-struct Foo(i32);
-impl Drop for Foo {
-    fn drop(&mut self) {
-        println!("{:?} dropped", self.0);
-    }
-}
-
-#[derive(Debug)]
-struct ConstainsDropField(Foo, #[allow(unused_tuple_struct_fields)] Foo);
-
-// `t` needs Drop because one of its elements needs drop,
-// therefore precise capture might affect drop ordering
-fn test1_all_need_migration() {
-    let t = (Foo(0), Foo(0));
-    let t1 = (Foo(0), Foo(0));
-    let t2 = (Foo(0), Foo(0));
-
-    let c = || {
-        let _ = (&t, &t1, &t2);
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t`, `t1`, `t2` to be fully captured
-        let _t = t.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.0`
-        let _t1 = t1.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t1`, but in Rust 2021, it will only capture `t1.0`
-        let _t2 = t2.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t2`, but in Rust 2021, it will only capture `t2.0`
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.0` will be dropped here as part of the closure
-//~| NOTE: in Rust 2018, `t1` is dropped here, but in Rust 2021, only `t1.0` will be dropped here as part of the closure
-//~| NOTE: in Rust 2018, `t2` is dropped here, but in Rust 2021, only `t2.0` will be dropped here as part of the closure
-
-// 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 = (Foo(0), Foo(0));
-    let t1 = (Foo(0), Foo(0));
-    let t2 = (Foo(0), Foo(0));
-
-    let c = || {
-        let _ = (&t, &t1);
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t`, `t1` to be fully captured
-        let _t = t.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.0`
-        let _t1 = t1.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t1`, but in Rust 2021, it will only capture `t1.0`
-        let _t2 = t2;
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.0` will be dropped here as part of the closure
-//~| NOTE: in Rust 2018, `t1` is dropped here, but in Rust 2021, only `t1.0` will be dropped here as part of the closure
-
-// 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 = (Foo(0), Foo(0));
-    let t1 = (Foo(0), Foo(0));
-    let c = || {
-        let _ = &t;
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t` to be fully captured
-        let _t = t.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.0`
-        println!("{:?}", t1.1);
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.0` will be dropped here as part of the closure
-
-// The root variable might not implement drop themselves but some path starting
-// at the root variable might implement Drop.
-//
-// If this path isn't captured we need to migrate for the root variable.
-fn test4_type_contains_drop_need_migration() {
-    let t = ConstainsDropField(Foo(0), Foo(0));
-
-    let c = || {
-        let _ = &t;
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t` to be fully captured
-        let _t = t.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.0`
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.0` will be dropped here as part of the closure
-
-// 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 test5_drop_non_drop_aggregate_need_migration() {
-    let t = (Foo(0), Foo(0), 0i32);
-
-    let c = || {
-        let _ = &t;
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t` to be fully captured
-        let _t = t.0;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.0`
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.0` will be dropped here as part of the closure
-
-// Test migration analysis in case of Significant and Insignificant Drop aggregates.
-fn test6_significant_insignificant_drop_aggregate_need_migration() {
-    let t = (Foo(0), String::new());
-
-    let c = || {
-        let _ = &t;
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t` to be fully captured
-        let _t = t.1;
-        //~^ NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.1`
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.1` will be dropped here as part of the closure
-
-// 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 test7_move_closures_non_copy_types_might_need_migration() {
-    let t = (Foo(0), Foo(0));
-    let t1 = (Foo(0), Foo(0), Foo(0));
-
-    let c = move || {
-        let _ = (&t1, &t);
-        //~^ ERROR: drop order
-        //~| NOTE: for more information, see
-        //~| HELP: add a dummy let to cause `t1`, `t` to be fully captured
-        println!("{:?} {:?}", t1.1, t.1);
-        //~^ NOTE: in Rust 2018, this closure captures all of `t1`, but in Rust 2021, it will only capture `t1.1`
-        //~| NOTE: in Rust 2018, this closure captures all of `t`, but in Rust 2021, it will only capture `t.1`
-    };
-
-    c();
-}
-//~^ NOTE: in Rust 2018, `t` is dropped here, but in Rust 2021, only `t.1` will be dropped here as part of the closure
-//~| NOTE: in Rust 2018, `t1` is dropped here, but in Rust 2021, only `t1.1` will be dropped here as part of the closure
-
-
-fn test8_drop_order_and_blocks() {
-    {
-        let tuple =
-          (Foo(0), Foo(1));
-        {
-            let c = || {
-                let _ = &tuple;
-                //~^ ERROR: drop order
-                //~| NOTE: for more information, see
-                //~| HELP: add a dummy let to cause `tuple` to be fully captured
-                tuple.0;
-                //~^ NOTE: in Rust 2018, this closure captures all of `tuple`, but in Rust 2021, it will only capture `tuple.0`
-            };
-
-            c();
-        }
-        //~^ NOTE: in Rust 2018, `tuple` is dropped here, but in Rust 2021, only `tuple.0` will be dropped here as part of the closure
-    }
-}
-
-fn test9_drop_order_and_nested_closures() {
-    let tuple =
-        (Foo(0), Foo(1));
-    let b = || {
-        let c = || {
-            let _ = &tuple;
-            //~^ ERROR: drop order
-            //~| NOTE: for more information, see
-            //~| HELP: add a dummy let to cause `tuple` to be fully captured
-            tuple.0;
-            //~^ NOTE: in Rust 2018, this closure captures all of `tuple`, but in Rust 2021, it will only capture `tuple.0`
-        };
-
-        c();
-    };
-    //~^ NOTE: in Rust 2018, `tuple` is dropped here, but in Rust 2021, only `tuple.0` will be dropped here as part of the closure
-
-    b();
-}
-
-// Test that we migrate if drop order of Vec<T> would be affected if T is a significant drop type
-fn test10_vec_of_significant_drop_type() {
-
-        let tup = (Foo(0), vec![Foo(3)]);
-
-        let _c = || { let _ = &tup; tup.0 };
-            //~^ ERROR: drop order
-            //~| NOTE: for more information, see
-            //~| HELP: add a dummy let to cause `tup` to be fully captured
-            //~| NOTE: in Rust 2018, this closure captures all of `tup`, but in Rust 2021, it will only capture `tup.0`
-}
-//~^ NOTE: in Rust 2018, `tup` is dropped here, but in Rust 2021, only `tup.0` will be dropped here as part of the closure
-
-fn main() {
-    test1_all_need_migration();
-    test2_only_precise_paths_need_migration();
-    test3_only_by_value_need_migration();
-    test4_type_contains_drop_need_migration();
-    test5_drop_non_drop_aggregate_need_migration();
-    test6_significant_insignificant_drop_aggregate_need_migration();
-    test7_move_closures_non_copy_types_might_need_migration();
-    test8_drop_order_and_blocks();
-    test9_drop_order_and_nested_closures();
-    test10_vec_of_significant_drop_type();
-}