Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 27 deletions

diff --git a/src/test/ui/on-unimplemented/parent-label.rs b/src/test/ui/on-unimplemented/parent-label.rs
deleted file mode 100644
index b65f64968..000000000
--- a/src/test/ui/on-unimplemented/parent-label.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Test scope annotations from `parent_label` parameter
-
-#![feature(rustc_attrs)]
-
-#[rustc_on_unimplemented(parent_label = "in this scope")]
-trait Trait {}
-
-struct Foo;
-
-fn f<T: Trait>(x: T) {}
-
-fn main() {
-    let x = || {
-        f(Foo {}); //~ ERROR the trait bound `Foo: Trait` is not satisfied
-        let y = || {
-            f(Foo {}); //~ ERROR the trait bound `Foo: Trait` is not satisfied
-        };
-    };
-
-    {
-        {
-            f(Foo {}); //~ ERROR the trait bound `Foo: Trait` is not satisfied
-        }
-    }
-
-    f(Foo {}); //~ ERROR the trait bound `Foo: Trait` is not satisfied
-}