Skip to content

Commit f40d12f

Browse files
committed
don't treat unit patterns as wildcard patterns
Fixes rust-lang#32004
1 parent af55b41 commit f40d12f

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

Diff for: src/librustc_typeck/check/_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ pub fn check_pat<'a, 'tcx>(pcx: &pat_ctxt<'a, 'tcx>,
204204
check_pat_enum(pcx, pat, path, subpats.as_ref().map(|v| &v[..]), expected, true);
205205
}
206206
PatKind::Path(ref path) => {
207-
check_pat_enum(pcx, pat, path, None, expected, false);
207+
check_pat_enum(pcx, pat, path, Some(&[]), expected, false);
208208
}
209209
PatKind::QPath(ref qself, ref path) => {
210210
let self_ty = fcx.to_ty(&qself.ty);

Diff for: src/test/compile-fail/issue-32004.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
enum Foo {
12+
Bar(i32),
13+
Baz
14+
}
15+
16+
struct S;
17+
18+
fn main() {
19+
match Foo::Baz {
20+
Foo::Bar => {}
21+
//~^ ERROR this pattern has 0 fields, but the corresponding variant
22+
_ => {}
23+
}
24+
25+
match S {
26+
S(()) => {}
27+
//~^ ERROR this pattern has 1 field, but the corresponding struct
28+
}
29+
}

0 commit comments

Comments
 (0)