---

flaper87 · flaper87 · commit 0ea58b10b063 · 2015-01-16T08:18:56.000+01:00
yaml --- r: 174177 b: refs/heads/batch c: 5aab863 h: refs/heads/master i: 174175: 6a77c5b v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 39fe05f58c5d7d805580826ce202d9a801813cb2
+refs/heads/batch: 5aab863ba2841fc55d0e34ebb50a07acecd50a80
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
diff --git a/branches/batch/src/librustc/middle/traits/select.rs b/branches/batch/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`	`}`