auto merge of #15985 : jfager/rust/r6334, r=pnkfelix

Closes #6334
rust-lang · Aug 6, 2014 · dd20f09 · dd20f09
2 parents e5df5f5 + 08f033b
commit dd20f09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs
@@ -1218,6 +1218,8 @@ fn ty_generics(ccx: &CrateCtxt,
 
         check_bounds_compatible(ccx.tcx, &param_bounds, ident, span);
 
+        param_bounds.trait_bounds.sort_by(|a,b| a.def_id.cmp(&b.def_id));
+
         param_bounds
     }
 
@@ -1340,4 +1342,3 @@ fn check_method_self_type<RS:RegionScope>(
         _ => {}
     }
 }
-
diff --git a/src/test/run-pass/issue-6334.rs b/src/test/run-pass/issue-6334.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test
-
 // Tests that everything still compiles and runs fine even when
 // we reorder the bounds.