From 32fa96486a5a9969d6151cf436dca4a31f8da292 Mon Sep 17 00:00:00 2001
From: Aman Arora <me@aman-arora.com>
Date: Tue, 29 Jun 2021 03:33:24 -0400
Subject: [PATCH] Edition 2021 for tests

---
 .../optimization/edge_case.rs                 |  5 +----
 .../optimization/edge_case.stderr             | 21 ++++++-------------
 .../optimization/edge_case_run_pass.rs        |  6 +-----
 .../optimization/edge_case_run_pass.stderr    | 11 ----------
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.stderr

diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs
index 960c61ccaef4..37a2a97d4427 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs
+++ b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.rs
@@ -1,7 +1,4 @@
-#![feature(capture_disjoint_fields)]
-//~^ WARNING: the feature `capture_disjoint_fields` is incomplete
-//~| NOTE: `#[warn(incomplete_features)]` on by default
-//~| NOTE: see issue #53488 <https://github.com/rust-lang/rust/issues/53488>
+// edition:2021
 
 #![feature(rustc_attrs)]
 #![allow(unused)]
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
index c9f9386b9aa1..b727c06d9528 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
+++ b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case.stderr
@@ -1,5 +1,5 @@
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/edge_case.rs:23:13
+  --> $DIR/edge_case.rs:20:13
    |
 LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -7,39 +7,30 @@ LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
-warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes
-  --> $DIR/edge_case.rs:1:12
-   |
-LL | #![feature(capture_disjoint_fields)]
-   |            ^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-   = note: see issue #53488 <https://github.com/rust-lang/rust/issues/53488> for more information
-
 error: First Pass analysis includes:
-  --> $DIR/edge_case.rs:23:39
+  --> $DIR/edge_case.rs:20:39
    |
 LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    |                                       ^^^^^^^^^^^^^^^
    |
 note: Capturing m[Deref,(0, 0),Deref] -> ImmBorrow
-  --> $DIR/edge_case.rs:23:48
+  --> $DIR/edge_case.rs:20:48
    |
 LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    |                                                ^^^^^
 
 error: Min Capture analysis includes:
-  --> $DIR/edge_case.rs:23:39
+  --> $DIR/edge_case.rs:20:39
    |
 LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    |                                       ^^^^^^^^^^^^^^^
    |
 note: Min Capture m[Deref,(0, 0),Deref] -> ImmBorrow
-  --> $DIR/edge_case.rs:23:48
+  --> $DIR/edge_case.rs:20:48
    |
 LL |     let c = #[rustc_capture_analysis] || drop(&m.a.0);
    |                                                ^^^^^
 
-error: aborting due to 3 previous errors; 1 warning emitted
+error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
index 2c4ba0c91a6d..033fd6f17753 100644
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
+++ b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.rs
@@ -1,8 +1,4 @@
-#![feature(capture_disjoint_fields)]
-//~^ WARNING: the feature `capture_disjoint_fields` is incomplete
-//~| NOTE: `#[warn(incomplete_features)]` on by default
-//~| NOTE: see issue #53488 <https://github.com/rust-lang/rust/issues/53488>
-
+// edition:2021
 // run-pass
 
 #![allow(unused)]
diff --git a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.stderr b/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.stderr
deleted file mode 100644
index 36906d1685ce..000000000000
--- a/src/test/ui/closures/2229_closure_analysis/optimization/edge_case_run_pass.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes
-  --> $DIR/edge_case_run_pass.rs:1:12
-   |
-LL | #![feature(capture_disjoint_fields)]
-   |            ^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-   = note: see issue #53488 <https://github.com/rust-lang/rust/issues/53488> for more information
-
-warning: 1 warning emitted
-