---

yaml
---
r: 36316
b: refs/heads/try2
c: 2f83baf
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 82017b8416798b4ad46c1b7416611b353374051a
+refs/heads/try2: 2f83baf857caca5cb0f8e996b5e9e25ce0fe22cd
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustc/middle/typeck/collect.rs

@@ -254,16 +254,26 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id, trait_ty: ty::t) {
 
 fn ensure_supertraits(ccx: @crate_ctxt,
                       id: ast::node_id,
+                      sp: codemap::span,
                       rp: Option<ty::region_variance>,
                       trait_refs: &[@ast::trait_ref]) {
-    if ccx.tcx.supertraits.contains_key(local_def(id)) { return; }
+    let tcx = ccx.tcx;
+    if tcx.supertraits.contains_key(local_def(id)) { return; }
 
     let instantiated = dvec::DVec();
     for trait_refs.each |trait_ref| {
         let (did, tpt) = instantiate_trait_ref(ccx, *trait_ref, rp);
+        if instantiated.any(|other_trait: &InstantiatedTraitRef|
+                            { (*other_trait).def_id == did }) {
+            // This means a trait inherited from the same supertrait more
+            // than once.
+            tcx.sess.span_err(sp, ~"Duplicate supertrait in trait \
+                                     declaration");
+            return;
+        }
         instantiated.push(InstantiatedTraitRef { def_id: did, tpt: tpt });
     }
-    ccx.tcx.supertraits.insert(local_def(id),
+    tcx.supertraits.insert(local_def(id),
                                @dvec::unwrap(move instantiated));
 }
 
@@ -551,7 +561,7 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
                it.id, ty_to_str(tcx, tpt.ty));
         write_ty_to_tcx(tcx, it.id, tpt.ty);
         ensure_trait_methods(ccx, it.id, tpt.ty);
-        ensure_supertraits(ccx, it.id, rp, supertraits);
+        ensure_supertraits(ccx, it.id, it.span, rp, supertraits);
 
         let (_, provided_methods) = split_trait_methods(trait_methods);
         let {bounds, _} = mk_substs(ccx, tps, rp);

branches/try2/src/test/compile-fail/issue-3953.rs

@@ -0,0 +1,23 @@
+use cmp::Eq;
+
+trait Hahaha: Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, //~ ERROR Duplicate supertrait in trait declaration
+              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
+              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
+              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
+              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
+              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq {}
+
+enum Lol = int;
+
+pub impl Lol: Hahaha {
+    pure fn eq(other: &Lol) -> bool { *self != **other }
+    pure fn ne(other: &Lol) -> bool { *self == **other }
+}
+
+fn main() {
+    if Lol(2) == Lol(4) {
+        io::println("2 == 4");
+    } else {
+        io::println("2 != 4");
+    }
+}