Sort trait bounds.

Closes #6334

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>(
         _ => {}
     }
 }
-

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.