Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 41 deletions

diff --git a/src/test/ui/editions/async-block-2015.stderr b/src/test/ui/editions/async-block-2015.stderr
deleted file mode 100644
index b792b8c1e..000000000
--- a/src/test/ui/editions/async-block-2015.stderr
+++ /dev/null
@@ -1,41 +0,0 @@
-error[E0670]: `async fn` is not permitted in Rust 2015
-  --> $DIR/async-block-2015.rs:1:1
-   |
-LL | async fn foo() {
-   | ^^^^^ to use `async fn`, switch to Rust 2018 or later
-   |
-   = help: pass `--edition 2021` to `rustc`
-   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
-
-error: expected identifier, found keyword `let`
-  --> $DIR/async-block-2015.rs:11:9
-   |
-LL |     let y = async {
-   |             ----- `async` blocks are only allowed in Rust 2018 or later
-LL |         let x = 42;
-   |         ^^^ expected identifier, found keyword
-   |
-   = help: pass `--edition 2021` to `rustc`
-   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
-
-error: expected identifier, found `42`
-  --> $DIR/async-block-2015.rs:19:9
-   |
-LL |     let z = async {
-   |             ----- `async` blocks are only allowed in Rust 2018 or later
-LL |         42
-   |         ^^ expected identifier
-   |
-   = help: pass `--edition 2021` to `rustc`
-   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
-
-error[E0422]: cannot find struct, variant or union type `async` in this scope
-  --> $DIR/async-block-2015.rs:7:13
-   |
-LL |     let x = async {};
-   |             ^^^^^ `async` blocks are only allowed in Rust 2018 or later
-
-error: aborting due to 4 previous errors
-
-Some errors have detailed explanations: E0422, E0670.
-For more information about an error, try `rustc --explain E0422`.