Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 33 deletions

diff --git a/src/test/ui/hygiene/cross-crate-methods.rs b/src/test/ui/hygiene/cross-crate-methods.rs
deleted file mode 100644
index 0e6f57c33..000000000
--- a/src/test/ui/hygiene/cross-crate-methods.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Test that methods defined in another crate are resolved correctly their
-// names differ only in `SyntaxContext`. This also checks that any name
-// resolution done when monomorphizing is correct.
-
-// run-pass
-// aux-build:methods.rs
-
-extern crate methods;
-
-use methods::*;
-
-struct A;
-struct B;
-struct C;
-
-impl MyTrait for A {}
-test_trait!(impl for B);
-test_trait2!(impl for C);
-
-fn main() {
-    check_crate_local();
-    check_crate_local_generic(A, B);
-    check_crate_local_generic(A, C);
-
-    test_trait!(check_resolutions);
-    test_trait2!(check_resolutions);
-    test_trait!(assert_no_override A);
-    test_trait2!(assert_no_override A);
-    test_trait!(assert_override B);
-    test_trait2!(assert_override B);
-    test_trait!(assert_override C);
-    test_trait2!(assert_override C);
-}