From 53ede4403bb79604eb378ba01f664a548a744044 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 17 Oct 2014 09:13:22 -0400
Subject: [PATCH] Coherence tests that seemed to be missing.

---
 ...nket-conflicts-with-blanket-implemented.rs | 38 +++++++++++++++++++
 ...et-conflicts-with-blanket-unimplemented.rs | 34 +++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 src/test/compile-fail/coherence-blanket-conflicts-with-blanket-implemented.rs
 create mode 100644 src/test/compile-fail/coherence-blanket-conflicts-with-blanket-unimplemented.rs

diff --git a/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-implemented.rs b/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-implemented.rs
new file mode 100644
index 00000000000..c0d82d35e30
--- /dev/null
+++ b/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-implemented.rs
@@ -0,0 +1,38 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::fmt::Show;
+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) -> uint;
+}
+
+trait Even { }
+
+trait Odd { }
+
+impl Even for int { }
+
+impl Odd for uint { }
+
+impl<T:Even> MyTrait for T { //~ ERROR E0119
+    fn get(&self) -> uint { 0 }
+}
+
+impl<T:Odd> MyTrait for T {
+    fn get(&self) -> uint { 0 }
+}
+
+fn main() { }
diff --git a/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-unimplemented.rs b/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-unimplemented.rs
new file mode 100644
index 00000000000..c44844bcf0b
--- /dev/null
+++ b/src/test/compile-fail/coherence-blanket-conflicts-with-blanket-unimplemented.rs
@@ -0,0 +1,34 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::fmt::Show;
+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 implement them at all).
+
+trait MyTrait {
+    fn get(&self) -> uint;
+}
+
+trait Even { }
+
+trait Odd { }
+
+impl<T:Even> MyTrait for T { //~ ERROR E0119
+    fn get(&self) -> uint { 0 }
+}
+
+impl<T:Odd> MyTrait for T {
+    fn get(&self) -> uint { 0 }
+}
+
+fn main() { }