Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/consts/const_constructor/const_constructor_qpath.rs b/src/test/ui/consts/const_constructor/const_constructor_qpath.rs
deleted file mode 100644
index 7c55f470f..000000000
--- a/src/test/ui/consts/const_constructor/const_constructor_qpath.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// run-pass
-
-trait ConstDefault {
-    const DEFAULT: Self;
-}
-
-#[derive(PartialEq)]
-enum E {
-    V(i32),
-    W(usize),
-}
-
-impl ConstDefault for E {
-    const DEFAULT: Self = Self::V(23);
-}
-
-impl ConstDefault for Option<i32> {
-    const DEFAULT: Self = Self::Some(23);
-}
-
-impl E {
-    const NON_DEFAULT: Self = Self::W(12);
-    const fn local_fn() -> Self {
-        Self::V(23)
-    }
-}
-
-const fn explicit_qpath() -> E {
-    let _x = <Option<usize>>::Some(23);
-    <E>::W(12)
-}
-
-fn main() {
-    assert!(E::DEFAULT == E::local_fn());
-    assert!(Option::DEFAULT == Some(23));
-    assert!(E::NON_DEFAULT == explicit_qpath());
-}