Skip to content

Commit 538f45f

Browse files
nikomatsakisflaper87
authored andcommitted
---
yaml --- r: 185309 b: refs/heads/master c: 3ebc2ab h: refs/heads/master i: 185307: 9144317 v: v3
1 parent 4a287ed commit 538f45f

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,5 +1,5 @@
11
---
2-
refs/heads/master: 640000a7c0d49e03b22c635e98679d5cffb18f1a
2+
refs/heads/master: 3ebc2abc6affd826c564630c036f4aa24c4fbe53
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/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)