Skip to content

Commit d4385b5

Browse files
committed
---
yaml --- r: 187206 b: refs/heads/try c: 839a9de h: refs/heads/master v: v3
1 parent 887a9fd commit d4385b5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: a962d47ef8a93ad125571a5628a883d0b50a97e7
5+
refs/heads/try: 839a9de8d385a082b571a88ff5a7f0c620afed1c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc/middle/traits/select.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,10 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
12731273
// #18453.
12741274
true
12751275
}
1276+
(&DefaultTraitCandidate(_), _) => {
1277+
// Prefer other candidates over default implementations.
1278+
true
1279+
}
12761280
(&ProjectionCandidate, &ParamCandidate(_)) => {
12771281
// FIXME(#20297) -- this gives where clauses precedent
12781282
// over projections. Really these are just two means

0 commit comments

Comments
 (0)