---

flaper87 · flaper87 · commit 31f8ccf7d00b · 2015-01-16T08:18:56.000+01:00
yaml --- r: 173449 b: refs/heads/snap-stage3 c: 5aab863 h: refs/heads/master i: 173447: 67aa9a0 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 896cb36ecab3eaeb7f101087e030e43771eca5ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 39fe05f58c5d7d805580826ce202d9a801813cb2
+refs/heads/snap-stage3: 5aab863ba2841fc55d0e34ebb50a07acecd50a80
 refs/heads/try: 957472483d3a2f43c0e4f7c2056280a1022af93c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
diff --git a/branches/snap-stage3/src/librustc/middle/traits/select.rs b/branches/snap-stage3/src/librustc/middle/traits/select.rs
@@ -725,7 +725,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
                 try!(self.assemble_candidates_from_impls(obligation, &mut candidates.vec));
 
                 // No explicit impls were declared for this type, consider the fallback rules.
-                if candidates.vec.is_empty() {
+                if candidates.vec.is_empty() && !candidates.ambiguous {
                     try!(self.assemble_builtin_bound_candidates(bound, stack, &mut candidates));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {`
`725`	`725`	`try!(self.assemble_candidates_from_impls(obligation, &mut candidates.vec));`
`726`	`726`
`727`	`727`	`// No explicit impls were declared for this type, consider the fallback rules.`
`728`		`- if candidates.vec.is_empty() {`
	`728`	`+ if candidates.vec.is_empty() && !candidates.ambiguous {`
`729`	`729`	`try!(self.assemble_builtin_bound_candidates(bound, stack, &mut candidates));`
`730`	`730`	`}`
`731`	`731`	`}`