Skip to content

Commit d53ab11

Browse files
committed
---
yaml --- r: 47768 b: refs/heads/incoming c: 092b611 h: refs/heads/master v: v3
1 parent 5b6e121 commit d53ab11

File tree

8 files changed

+214
-894
lines changed

8 files changed

+214
-894
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: cf2ddf0437e347be4fb830772421ef1534cdab0e
9+
refs/heads/incoming: 092b6114c114edbe6f9930291aca74f549b2b64a
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/typeck/check/_match.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ pub fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
362362
ast::pat_ident(*) if pat_is_const(tcx.def_map, pat) => {
363363
let const_did = ast_util::def_id_of_def(tcx.def_map.get(&pat.id));
364364
let const_tpt = ty::lookup_item_type(tcx, const_did);
365+
demand::suptype(fcx, pat.span, expected, const_tpt.ty);
365366
fcx.write_ty(pat.id, const_tpt.ty);
366367
}
367368
ast::pat_ident(bm, name, sub) if pat_is_binding(tcx.def_map, pat) => {

0 commit comments

Comments
 (0)