Skip to content

Commit 327d05d

Browse files
committed
---
yaml --- r: 58062 b: refs/heads/auto c: 32b3d3e h: refs/heads/master v: v3
1 parent 14adc91 commit 327d05d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 13df2ea69c332d7a20c7ab394020430a09dad507
17+
refs/heads/auto: 32b3d3e9ebd8dbc1073445b3be9676da85b6410c
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: @ast::pat, path: @ast::Path,
120120
let enum_tpt = ty::lookup_item_type(tcx, enm);
121121
instantiate_path(pcx.fcx, path, enum_tpt, pat.span, pat.id,
122122
pcx.block_region);
123-
123+
124124
// check that the type of the value being matched is a subtype
125125
// of the type of the pattern:
126126
let pat_ty = fcx.node_ty(pat.id);
127127
demand::subtype(fcx, pat.span, expected, pat_ty);
128-
128+
129129
// Get the expected types of the arguments.
130130
arg_types = {
131131
let vinfo =
@@ -143,18 +143,18 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: @ast::pat, path: @ast::Path,
143143
}
144144
})
145145
};
146-
146+
147147
kind_name = "variant";
148148
}
149149
None => {
150150
let resolved_expected =
151151
fcx.infcx().ty_to_str(fcx.infcx().resolve_type_vars_if_possible(expected));
152152
fcx.infcx().type_error_message_str(pat.span,
153153
|actual| {
154-
fmt!("mismatched types: expected `%s` but found %s",
155-
resolved_expected, actual)},
156-
~"a structure pattern",
157-
None);
154+
fmt!("mismatched types: expected `%s` but found %s",
155+
resolved_expected, actual)},
156+
~"a structure pattern",
157+
None);
158158
fcx.write_error(pat.id);
159159
kind_name = "[error]";
160160
arg_types = (copy subpats).get_or_default(~[]).map(|_|

0 commit comments

Comments
 (0)