Skip to content

Commit cdab7f7

Browse files
committed
---
yaml --- r: 185021 b: refs/heads/snap-stage3 c: 1cc5a87 h: refs/heads/master i: 185019: 1c0b0e6 v: v3
1 parent 5faf537 commit cdab7f7

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: 38ef5ee48f7a2994a7fd8e6a1a818d378d51d40e
4+
refs/heads/snap-stage3: 1cc5a87c08fb1e9c6214e3370c78e3c217a0bae4
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
@@ -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)