diff options
| author | bors <bors@rust-lang.org> | 2019-06-24 05:00:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-24 05:00:10 +0000 |
| commit | 3cc34867339356a34428e9ec3efa618d86228fed (patch) | |
| tree | bbfaf3093c4a894726e09107b8d385225c40795e /src/libsyntax/parse | |
| parent | 85ed21e83c9f42203cfe06d41eab3f160bd13518 (diff) | |
| parent | 4d537141835f825892e2be868620e98585b3d4a9 (diff) | |
| download | rust-3cc34867339356a34428e9ec3efa618d86228fed.tar.gz rust-3cc34867339356a34428e9ec3efa618d86228fed.zip | |
Auto merge of #62075 - Centril:guardless-match-arms, r=petrochenkov
Remove `ast::Guard` With the introduction of `ast::ExprKind::Let` in https://github.com/rust-lang/rust/pull/60861, the `ast::Guard` structure is now redundant in terms of representing [`if let` guards](https://github.com/rust-lang/rust/issues/51114) in AST since it can be represented by `ExprKind::Let` syntactically. Therefore, we remove `ast::Guard` here. However, we keep `hir::Guard` because the semantic representation is a different matter and this story is more unclear right now (might involve `goto 'arm` in HIR or something...). r? @petrochenkov
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b2003e2d6bd..f3ace84162e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3,7 +3,7 @@ use crate::ast::{AngleBracketedArgs, ParenthesizedArgs, AttrStyle, BareFnTy}; use crate::ast::{GenericBound, TraitBoundModifier}; use crate::ast::Unsafety; -use crate::ast::{Mod, AnonConst, Arg, Arm, Guard, Attribute, BindingMode, TraitItemKind}; +use crate::ast::{Mod, AnonConst, Arg, Arm, Attribute, BindingMode, TraitItemKind}; use crate::ast::Block; use crate::ast::{BlockCheckMode, CaptureBy, Movability}; use crate::ast::{Constness, Crate}; @@ -3396,7 +3396,7 @@ impl<'a> Parser<'a> { let lo = self.token.span; let pats = self.parse_pats()?; let guard = if self.eat_keyword(kw::If) { - Some(Guard::If(self.parse_expr()?)) + Some(self.parse_expr()?) } else { None }; |
