Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
deleted file mode 100644
index 93a4bc5fe..000000000
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::fmt::Debug;
-use std::default::Default;
-
-// Test that two blanket impls conflict (at least without negative
-// bounds).  After all, some other crate could implement Even or Odd
-// for the same type (though this crate doesn't).
-
-trait MyTrait {
-    fn get(&self) -> usize;
-}
-
-trait Even { }
-
-trait Odd { }
-
-impl Even for isize { }
-
-impl Odd for usize { }
-
-impl<T:Even> MyTrait for T {
-    fn get(&self) -> usize { 0 }
-}
-
-impl<T:Odd> MyTrait for T {
-//~^ ERROR E0119
-
-    fn get(&self) -> usize { 0 }
-}
-
-fn main() { }