Skip to content

Commit 7a2daf9

Browse files
committed
---
yaml --- r: 192978 b: refs/heads/beta c: 1cc5a87 h: refs/heads/master v: v3
1 parent affc4eb commit 7a2daf9

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
@@ -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: 38ef5ee48f7a2994a7fd8e6a1a818d378d51d40e
34+
refs/heads/beta: 1cc5a87c08fb1e9c6214e3370c78e3c217a0bae4
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1642,13 +1642,15 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
16421642
ty::ty_str |
16431643
ty::ty_err |
16441644
ty::ty_param(..) |
1645+
ty::ty_infer(ty::IntVar(_)) |
1646+
ty::ty_infer(ty::FloatVar(_)) |
16451647
ty::ty_char => {
16461648
Some(Vec::new())
16471649
}
16481650

16491651
ty::ty_trait(..) |
16501652
ty::ty_projection(..) |
1651-
ty::ty_infer(..) => {
1653+
ty::ty_infer(_) => {
16521654
self.tcx().sess.bug(
16531655
&format!(
16541656
"asked to assemble constituent types of unexpected type: {}",

0 commit comments

Comments
 (0)