Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/coherence/coherence_inherent_cc.rs b/src/test/ui/coherence/coherence_inherent_cc.rs
deleted file mode 100644
index 759ada248..000000000
--- a/src/test/ui/coherence/coherence_inherent_cc.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// aux-build:coherence_inherent_cc_lib.rs
-
-// Tests that methods that implement a trait cannot be invoked
-// unless the trait is imported.
-
-extern crate coherence_inherent_cc_lib;
-
-mod Import {
-    // Trait is in scope here:
-    use coherence_inherent_cc_lib::TheStruct;
-    use coherence_inherent_cc_lib::TheTrait;
-
-    fn call_the_fn(s: &TheStruct) {
-        s.the_fn();
-    }
-}
-
-mod NoImport {
-    // Trait is not in scope here:
-    use coherence_inherent_cc_lib::TheStruct;
-
-    fn call_the_fn(s: &TheStruct) {
-        s.the_fn();
-        //~^ ERROR E0599
-    }
-}
-
-fn main() {}