Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/consts/miri_unleashed/assoc_const_2.rs b/src/test/ui/consts/miri_unleashed/assoc_const_2.rs
deleted file mode 100644
index aad5b3460..000000000
--- a/src/test/ui/consts/miri_unleashed/assoc_const_2.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// build-fail
-
-// a test demonstrating that const qualification cannot prevent monomorphization time errors
-
-trait Foo {
-    const X: u32;
-}
-
-trait Bar<U: Foo> {
-    const F: u32 = 100 / U::X; //~ ERROR evaluation of `<std::string::String as Bar<std::string::String>>::F` failed
-}
-
-impl Foo for () {
-    const X: u32 = 42;
-}
-
-impl Foo for String {
-    const X: u32 = 0;
-}
-
-impl Bar<()> for () {}
-impl Bar<String> for String {}
-
-fn main() {
-    let x = <() as Bar<()>>::F;
-    // this test only causes errors due to the line below, so post-monomorphization
-    let y = <String as Bar<String>>::F; //~ constant
-}