nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix false positive "Missing match arm".

Browse Source
This commit is contained in:
Dawer 2021-05-15 00:09:17 +05:00
parent 6c0f20d79f
commit 2abb4c99fe
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/hir_ty/src/diagnostics/match_check.rs
View File

@ -1119,6 +1119,7 @@ fn main() {
(true, false, true) => (), (true, false, true) => (),
(true) => (), (true) => (),
} }
match (true, false) { (true,) => {} }
match (0) { () => () } match (0) { () => () }
match Unresolved::Bar { Unresolved::Baz => () } match Unresolved::Bar { Unresolved::Baz => () }
} }

9
crates/hir_ty/src/infer/pat.rs
View File

@ -126,11 +126,12 @@ impl<'a> InferenceContext<'a> {
_ => &[], _ => &[],
}; };
let (pre, post) = match ellipsis { let ((pre, post), n_uncovered_patterns) = match ellipsis {
Some(idx) => args.split_at(idx), Some(idx) => {
None => (&args[..], &[][..]), (args.split_at(idx), expectations.len().saturating_sub(args.len()))
}
None => ((&args[..], &[][..]), 0),
}; };
let n_uncovered_patterns = expectations.len().saturating_sub(args.len());
let err_ty = self.err_ty(); let err_ty = self.err_ty();
let mut expectations_iter = let mut expectations_iter =
expectations.iter().map(|a| a.assert_ty_ref(&Interner)).chain(repeat(&err_ty)); expectations.iter().map(|a| a.assert_ty_ref(&Interner)).chain(repeat(&err_ty));

2
crates/hir_ty/src/tests/patterns.rs
View File

@ -732,7 +732,7 @@ fn foo(tuple: (u8, i16, f32)) {
111..112 'a': u8 111..112 'a': u8
114..115 'b': i16 114..115 'b': i16
124..126 '{}': () 124..126 '{}': ()
136..142 '(a, b)': (u8, i16, f32) 136..142 '(a, b)': (u8, i16)
137..138 'a': u8 137..138 'a': u8
140..141 'b': i16 140..141 'b': i16
146..161 '{/*too short*/}': () 146..161 '{/*too short*/}': ()