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/resolve/block-with-trait-parent.rs b/src/test/ui/resolve/block-with-trait-parent.rs
deleted file mode 100644
index bc86f94e9..000000000
--- a/src/test/ui/resolve/block-with-trait-parent.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// check-pass
-
-trait Trait {
-    fn method(&self) {
-        // Items inside a block turn it into a module internally.
-        struct S;
-        impl Trait for S {}
-
-        // OK, `Trait` is in scope here from method resolution point of view.
-        S.method();
-    }
-}
-
-fn main() {}