Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.rs b/src/test/ui/nll/user-annotations/constant-in-expr-normalize.rs
deleted file mode 100644
index b7095430d..000000000
--- a/src/test/ui/nll/user-annotations/constant-in-expr-normalize.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-trait Mirror {
-    type Me;
-}
-
-impl<T> Mirror for T {
-    type Me = T;
-}
-
-trait Foo<'a> {
-    const C: <&'a u32 as Mirror>::Me;
-}
-
-impl<'a, T> Foo<'a> for T {
-    const C: &'a u32 = &22;
-}
-
-fn foo<'a>(_: &'a u32) -> &'static u32 {
-    <() as Foo<'a>>::C //~ ERROR
-}
-
-fn main() {
-}