Skip to content

Commit 454bf14

Browse files
nikomatsakisflaper87
authored andcommitted
---
yaml --- r: 185023 b: refs/heads/snap-stage3 c: 3ebc2ab h: refs/heads/master i: 185021: cdab7f7 185019: 1c0b0e6 185015: b655def 185007: ffebcf1 184991: d50e697 184959: 4f31baf v: v3
1 parent cc22f53 commit 454bf14

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: f0f7ca27de6b4e03f30012656dad270cda55a363
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 640000a7c0d49e03b22c635e98679d5cffb18f1a
4+
refs/heads/snap-stage3: 3ebc2abc6affd826c564630c036f4aa24c4fbe53
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/traits/select.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,9 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
16831683
ty::ty_trait(..) |
16841684
ty::ty_param(..) |
16851685
ty::ty_projection(..) |
1686-
ty::ty_infer(ty::TyVar(_)) => {
1686+
ty::ty_infer(ty::TyVar(_)) |
1687+
ty::ty_infer(ty::FreshTy(_)) |
1688+
ty::ty_infer(ty::FreshIntTy(_)) => {
16871689
self.tcx().sess.bug(
16881690
&format!(
16891691
"asked to assemble constituent types of unexpected type: {}",

0 commit comments

Comments
 (0)