---

bors · bors · commit f161630f6e29 · 2014-08-06T19:26:19.000Z
yaml --- r: 126431 b: refs/heads/master c: 51e19e7 h: refs/heads/master i: 126429: 6320400 126427: 40d4ab0 126423: 9c82c92 126415: 3a0adb8 126399: f7a958b v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ffa258846ad7669a67850da9b1d5fa534e87f04f
+refs/heads/master: 51e19e750185f60e404412f702f8f2edc7bc1245
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
 refs/heads/try: cd2003ffd8dd976342f9e8fc1429ae93d6780e81
diff --git a/trunk/src/librustc/middle/typeck/collect.rs b/trunk/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/trunk/src/test/run-pass/issue-6334.rs b/trunk/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.
 

Original file line number	Diff line number	Diff line change
`@@ -1218,6 +1218,8 @@ fn ty_generics(ccx: &CrateCtxt,`
`1218`	`1218`
`1219`	`1219`	`check_bounds_compatible(ccx.tcx, &param_bounds, ident, span);`
`1220`	`1220`
	`1221`	`+ param_bounds.trait_bounds.sort_by(\|a,b\| a.def_id.cmp(&b.def_id));`
	`1222`	`+`
`1221`	`1223`	`param_bounds`
`1222`	`1224`	`}`
`1223`	`1225`
`@@ -1340,4 +1342,3 @@ fn check_method_self_type<RS:RegionScope>(`
`1340`	`1342`	`_ => {}`
`1341`	`1343`	`}`
`1342`	`1344`	`}`
`1343`		`-`