diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-17 00:16:29 +0200 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-23 01:29:29 +0200 |
| commit | 61fc727fe07abaeee78475202dd575f0fddfc653 (patch) | |
| tree | 3b4b4f787cf02666765483933fda5c8755ade8d0 /src | |
| parent | a505d9d20a697d90242158ef1594c611cb23fbfa (diff) | |
| download | rust-61fc727fe07abaeee78475202dd575f0fddfc653.tar.gz rust-61fc727fe07abaeee78475202dd575f0fddfc653.zip | |
let_chains: Fuse PatternSource::Let & ::LetExpr.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_resolve/lib.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index fdef707e347..a9e4ffd5e7f 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -485,8 +485,6 @@ type BindingMap = FxHashMap<Ident, BindingInfo>; #[derive(Copy, Clone, PartialEq, Eq, Debug)] enum PatternSource { Match, - // FIXME(54883): Consider fusing with `Let` below once let-statements support or-patterns. - LetExpr, Let, For, FnParam, @@ -496,7 +494,7 @@ impl PatternSource { fn descr(self) -> &'static str { match self { PatternSource::Match => "match binding", - PatternSource::Let | PatternSource::LetExpr => "let binding", + PatternSource::Let => "let binding", PatternSource::For => "for binding", PatternSource::FnParam => "function parameter", } @@ -3153,7 +3151,7 @@ impl<'a> Resolver<'a> { ); } Some(..) if pat_src == PatternSource::Match || - pat_src == PatternSource::LetExpr => { + pat_src == PatternSource::Let => { // `Variant1(a) | Variant2(a)`, ok // Reuse definition from the first `a`. res = self.ribs[ValueNS].last_mut().unwrap().bindings[&ident]; @@ -4348,7 +4346,7 @@ impl<'a> Resolver<'a> { ExprKind::Let(ref pats, ref scrutinee) => { self.visit_expr(scrutinee); - self.resolve_pats(pats, PatternSource::LetExpr); + self.resolve_pats(pats, PatternSource::Let); } ExprKind::If(ref cond, ref then, ref opt_else) => { |