Skip to content

Commit 14f17fb

Browse files
committed
---
yaml --- r: 47847 b: refs/heads/incoming c: ad9c54c h: refs/heads/master i: 47845: d2cd1c1 47843: 02ef3bb 47839: 34464e9 v: v3
1 parent a05ab0f commit 14f17fb

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-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: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: f823d83718cf84cd9459b68726debd5463e31d97
9+
refs/heads/incoming: ad9c54c631a39bbaf926021f18d683feba49fc09
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ pub fn check_pat_variant(pcx: pat_ctxt, pat: @ast::pat, path: @ast::path,
131131
// Assign the pattern the type of the struct.
132132
let ctor_tpt = ty::lookup_item_type(tcx, s_def_id);
133133
let struct_tpt = if ty::is_fn_ty(ctor_tpt.ty) {
134-
{ty: ty::ty_fn_ret(ctor_tpt.ty), ..ctor_tpt}
134+
ty::ty_param_bounds_and_ty {ty: ty::ty_fn_ret(ctor_tpt.ty),
135+
..ctor_tpt}
135136
} else {
136137
ctor_tpt
137138
};

0 commit comments

Comments
 (0)