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/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
deleted file mode 100644
index 6a9db2173..000000000
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::fmt::Debug;
-use std::default::Default;
-
-// Test that a blank impl for all T conflicts with an impl for some
-// specific T, even when there are multiple type parameters involved.
-
-trait MyTrait<T> {
-    fn get(&self) -> T;
-}
-
-impl<T> MyTrait<T> for T {
-    fn get(&self) -> T {
-        panic!()
-    }
-}
-
-#[derive(Clone)]
-struct MyType {
-    dummy: usize
-}
-
-impl MyTrait<MyType> for MyType {
-//~^ ERROR E0119
-    fn get(&self) -> usize { (*self).clone() }
-}
-
-fn main() { }