diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:13 +0000 |
commit | 218caa410aa38c29984be31a5229b9fa717560ee (patch) | |
tree | c54bd55eeb6e4c508940a30e94c0032fbd45d677 /src/test/ui/rust-2021/generic-type-collision.fixed | |
parent | Releasing progress-linux version 1.67.1+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-218caa410aa38c29984be31a5229b9fa717560ee.tar.xz rustc-218caa410aa38c29984be31a5229b9fa717560ee.zip |
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/test/ui/rust-2021/generic-type-collision.fixed')
-rw-r--r-- | src/test/ui/rust-2021/generic-type-collision.fixed | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/test/ui/rust-2021/generic-type-collision.fixed b/src/test/ui/rust-2021/generic-type-collision.fixed deleted file mode 100644 index feba7d19b..000000000 --- a/src/test/ui/rust-2021/generic-type-collision.fixed +++ /dev/null @@ -1,18 +0,0 @@ -// check-pass -// run-rustfix -// edition 2018 -#![warn(rust_2021_prelude_collisions)] - -trait MyTrait<A> { - fn from_iter(x: Option<A>); -} - -impl<T> MyTrait<()> for Vec<T> { - fn from_iter(_: Option<()>) {} -} - -fn main() { - <Vec<i32> as MyTrait<_>>::from_iter(None); - //~^ WARNING trait-associated function `from_iter` will become ambiguous in Rust 2021 - //~^^ WARNING this is accepted in the current edition -} |