Skip to content

Commit c428c7b

Browse files
committed
---
yaml --- r: 29899 b: refs/heads/incoming c: 09cf5c1 h: refs/heads/master i: 29897: b6afc6a 29895: 86212b0 v: v3
1 parent fcc5ed3 commit c428c7b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 5026ea044650baeb6a1f61f2eca89e3510ae82dd
9+
refs/heads/incoming: 09cf5c1de412d55ac0f082e1dd5b6e52140d3486
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/typeck/check/alt.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
235235
ast::pat_struct(path, fields, etc) => {
236236
// Grab the class data that we care about.
237237
let class_fields, class_id, substitutions;
238-
match structure_of(fcx, pat.span, expected) {
238+
// FIXME(#3217) If this were "match structure_of...", this bug causes
239+
// it to not live long enough for 'substitutions'.
240+
let structure = structure_of(fcx, pat.span, expected);
241+
match structure {
239242
ty::ty_class(cid, ref substs) => {
240243
class_id = cid;
241244
substitutions = substs;

0 commit comments

Comments
 (0)