Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 29 deletions

diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
deleted file mode 100644
index 02f9217da..000000000
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Test that a blank impl for all T:PartialEq conflicts with an impl for some
-// specific T when T:PartialEq.
-
-trait OtherTrait {
-    fn noop(&self);
-}
-
-trait MyTrait {
-    fn get(&self) -> usize;
-}
-
-impl<T:OtherTrait> MyTrait for T {
-    fn get(&self) -> usize { 0 }
-}
-
-struct MyType {
-    dummy: usize
-}
-
-impl MyTrait for MyType {
-//~^ ERROR E0119
-    fn get(&self) -> usize { self.dummy }
-}
-
-impl OtherTrait for MyType {
-    fn noop(&self) { }
-}
-
-fn main() { }