Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/ui/associated-consts/shadowed-const.rs b/src/test/ui/associated-consts/shadowed-const.rs
deleted file mode 100644
index cfdb391d3..000000000
--- a/src/test/ui/associated-consts/shadowed-const.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Checking that none of these ICE, which was introduced in
-// https://github.com/rust-lang/rust/issues/93553
-trait Foo {
-    type Bar;
-}
-
-trait Baz: Foo {
-    const Bar: Self::Bar;
-}
-
-trait Baz2: Foo {
-    const Bar: u32;
-
-    fn foo() -> Self::Bar;
-}
-
-trait Baz3 {
-  const BAR: usize;
-  const QUX: Self::BAR;
-  //~^ ERROR found associated const
-}
-
-fn main() {}