Auto merge of #29141 - marcusklaas:pat-expr, r=alexcrichton

Closes https://github.com/rust-lang/rust/issues/29120.
This commit is contained in:
bors 2015-10-18 20:06:07 +00:00
commit d3f497861d

View file

@ -1583,11 +1583,11 @@ pub fn parse_literal_maybe_minus(&mut self) -> PResult<P<Expr>> {
let lo = self.span.lo;
let literal = P(try!(self.parse_lit()));
let hi = self.span.hi;
let hi = self.last_span.hi;
let expr = self.mk_expr(lo, hi, ExprLit(literal));
if minus_present {
let minus_hi = self.span.hi;
let minus_hi = self.last_span.hi;
let unary = self.mk_unary(UnNeg, expr);
Ok(self.mk_expr(minus_lo, minus_hi, unary))
} else {