Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 14 deletions

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