From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../future-prelude-collision-generic.stderr        | 34 ----------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 src/test/ui/rust-2021/future-prelude-collision-generic.stderr

(limited to 'src/test/ui/rust-2021/future-prelude-collision-generic.stderr')

diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr b/src/test/ui/rust-2021/future-prelude-collision-generic.stderr
deleted file mode 100644
index 9893b3eba..000000000
--- a/src/test/ui/rust-2021/future-prelude-collision-generic.stderr
+++ /dev/null
@@ -1,34 +0,0 @@
-warning: trait-associated function `from_iter` will become ambiguous in Rust 2021
-  --> $DIR/future-prelude-collision-generic.rs:28:5
-   |
-LL |     Generic::from_iter(1);
-   |     ^^^^^^^^^^^^^^^^^^ help: disambiguate the associated function: `<Generic<'_, _> as MyFromIter>::from_iter`
-   |
-   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-   = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/prelude.html>
-note: the lint level is defined here
-  --> $DIR/future-prelude-collision-generic.rs:5:9
-   |
-LL | #![warn(rust_2021_prelude_collisions)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-warning: trait-associated function `from_iter` will become ambiguous in Rust 2021
-  --> $DIR/future-prelude-collision-generic.rs:31:5
-   |
-LL |     Generic::<'static, i32>::from_iter(1);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: disambiguate the associated function: `<Generic::<'static, i32> as MyFromIter>::from_iter`
-   |
-   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-   = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/prelude.html>
-
-warning: trait-associated function `from_iter` will become ambiguous in Rust 2021
-  --> $DIR/future-prelude-collision-generic.rs:34:5
-   |
-LL |     Generic::<'_, _>::from_iter(1);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: disambiguate the associated function: `<Generic::<'_, _> as MyFromIter>::from_iter`
-   |
-   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-   = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/prelude.html>
-
-warning: 3 warnings emitted
-
-- 
cgit v1.2.3