Skip to content

Commit 6e4fa92

Browse files
committed
---
yaml --- r: 187628 b: refs/heads/tmp c: 839a9de h: refs/heads/master v: v3
1 parent 3dff9bf commit 6e4fa92

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
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: a962d47ef8a93ad125571a5628a883d0b50a97e7
37+
refs/heads/tmp: 839a9de8d385a082b571a88ff5a7f0c620afed1c
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/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)