---

yaml
---
r: 138407
b: refs/heads/master
c: 53ede44
h: refs/heads/master
i:
  138405: b149877
  138403: 2af240e
  138399: 0086df1
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 450263de4a93e7dd4eb863c8f4b98fc780b9c385
+refs/heads/master: 53ede4403bb79604eb378ba01f664a548a744044
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5

trunk/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() { }

trunk/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() { }