Skip to content

Commit f910dd4

Browse files
committed
---
yaml --- r: 192958 b: refs/heads/beta c: 839a9de h: refs/heads/master v: v3
1 parent 2769b1f commit f910dd4

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: a962d47ef8a93ad125571a5628a883d0b50a97e7
34+
refs/heads/beta: 839a9de8d385a082b571a88ff5a7f0c620afed1c
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

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