mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Result<_, IsNeverPattern> consistently

Browse Source
This commit is contained in:
Nadrieril 2024-01-09 17:04:20 +01:00
parent 807d618676
commit 223cda4107
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_resolve/src/late.rs
View File

@ -3213,9 +3213,10 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
PatKind::Or(ref ps) => { PatKind::Or(ref ps) => {
// Check the consistency of this or-pattern and // Check the consistency of this or-pattern and
// then add all bindings to the larger map. // then add all bindings to the larger map.
let (bm, np) = self.compute_and_check_or_pat_binding_map(ps); match self.compute_and_check_or_pat_binding_map(ps) {
binding_map.extend(bm); Ok(bm) => binding_map.extend(bm),
is_never_pat |= np; Err(IsNeverPattern) => is_never_pat = true,
}
return false; return false;
} }
PatKind::Never => is_never_pat = true, PatKind::Never => is_never_pat = true,
@ -3249,7 +3250,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
fn compute_and_check_or_pat_binding_map( fn compute_and_check_or_pat_binding_map(
&mut self, &mut self,
pats: &[P<Pat>], pats: &[P<Pat>],
) -> (FxIndexMap<Ident, BindingInfo>, bool) { ) -> Result<FxIndexMap<Ident, BindingInfo>, IsNeverPattern> {
let mut missing_vars = FxIndexMap::default(); let mut missing_vars = FxIndexMap::default();
let mut inconsistent_vars = FxIndexMap::default(); let mut inconsistent_vars = FxIndexMap::default();
@ -3314,12 +3315,16 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
} }
// 5) Bubble up the final binding map. // 5) Bubble up the final binding map.
let is_never_pat = not_never_pats.is_empty(); if not_never_pats.is_empty() {
let mut binding_map = FxIndexMap::default(); // All the patterns are never patterns, so the whole or-pattern is one too.
for (bm, _) in not_never_pats { Err(IsNeverPattern)
binding_map.extend(bm); } else {
let mut binding_map = FxIndexMap::default();
for (bm, _) in not_never_pats {
binding_map.extend(bm);
}
Ok(binding_map)
} }
(binding_map, is_never_pat)
} }
/// Check the consistency of bindings wrt or-patterns and never patterns. /// Check the consistency of bindings wrt or-patterns and never patterns.