---

flaper87 · flaper87 · commit 561033177797 · 2015-01-16T08:18:56.000+01:00
yaml --- r: 173904 b: refs/heads/auto c: 5aab863 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 39fe05f58c5d7d805580826ce202d9a801813cb2
+refs/heads/auto: 5aab863ba2841fc55d0e34ebb50a07acecd50a80
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/traits/select.rs b/branches/auto/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`	`}`