Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 15 deletions

diff --git a/src/test/ui/nll/user-annotations/inherent-associated-constants.rs b/src/test/ui/nll/user-annotations/inherent-associated-constants.rs
deleted file mode 100644
index fe2641fd6..000000000
--- a/src/test/ui/nll/user-annotations/inherent-associated-constants.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-struct A<'a>(&'a ());
-
-impl A<'static> {
-    const IC: i32 = 10;
-}
-
-fn non_wf_associated_const<'a>(x: i32) {
-    A::<'a>::IC; //~ ERROR lifetime may not live long enough
-}
-
-fn wf_associated_const<'a>(x: i32) {
-    A::<'static>::IC;
-}
-
-fn main() {}