bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_parse: remove unneccessary wrapping of return value in fn mk_range() which would always return Ok(..)

Browse source
This commit is contained in:
Matthias Krüger 2021-02-21 12:54:49 +01:00
parent 4cb649bdb1
commit 12080dc3a3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_parse/src/parser/expr.rs
View file

@ -426,7 +426,7 @@ impl<'a> Parser<'a> {
let span = self.mk_expr_sp(&lhs, lhs.span, rhs_span); let span = self.mk_expr_sp(&lhs, lhs.span, rhs_span);
let limits = let limits =
if op == AssocOp::DotDot { RangeLimits::HalfOpen } else { RangeLimits::Closed }; if op == AssocOp::DotDot { RangeLimits::HalfOpen } else { RangeLimits::Closed };
Ok(self.mk_expr(span, self.mk_range(Some(lhs), rhs, limits)?, AttrVec::new())) Ok(self.mk_expr(span, self.mk_range(Some(lhs), rhs, limits), AttrVec::new()))
} }
fn is_at_start_of_range_notation_rhs(&self) -> bool { fn is_at_start_of_range_notation_rhs(&self) -> bool {
@ -474,7 +474,7 @@ impl<'a> Parser<'a> {
} else { } else {
(lo, None) (lo, None)
}; };
Ok(this.mk_expr(span, this.mk_range(None, opt_end, limits)?, attrs.into())) Ok(this.mk_expr(span, this.mk_range(None, opt_end, limits), attrs.into()))
}) })
} }
@ -2396,12 +2396,12 @@ impl<'a> Parser<'a> {
start: Option<P<Expr>>, start: Option<P<Expr>>,
end: Option<P<Expr>>, end: Option<P<Expr>>,
limits: RangeLimits, limits: RangeLimits,
) -> PResult<'a, ExprKind> { ) -> ExprKind {
if end.is_none() && limits == RangeLimits::Closed { if end.is_none() && limits == RangeLimits::Closed {
self.error_inclusive_range_with_no_end(self.prev_token.span); self.error_inclusive_range_with_no_end(self.prev_token.span);
Ok(ExprKind::Err) ExprKind::Err
} else { } else {
Ok(ExprKind::Range(start, end, limits)) ExprKind::Range(start, end, limits)
} }
} }