---

flaper87 · flaper87 · commit ca74a85df444 · 2015-01-16T08:18:56.000+01:00
yaml --- r: 173650 b: refs/heads/master c: 5aab863 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 39fe05f58c5d7d805580826ce202d9a801813cb2
+refs/heads/master: 5aab863ba2841fc55d0e34ebb50a07acecd50a80
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 210f0dcf007104240b2e286ed0b80cb4a61d7bae
 refs/heads/try: 957472483d3a2f43c0e4f7c2056280a1022af93c
diff --git a/trunk/src/librustc/middle/traits/select.rs b/trunk/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`	`}`