Skip to content

Commit

Permalink
Fix the span for try shorthand expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusklaas committed Apr 11, 2016
1 parent c0b8c43 commit 05e4116
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2576,7 +2576,7 @@ impl<'a> Parser<'a> {
loop {
// expr?
while self.eat(&token::Question) {
let hi = self.span.hi;
let hi = self.last_span.hi;
e = self.mk_expr(lo, hi, ExprKind::Try(e), None);
}

Expand Down
20 changes: 20 additions & 0 deletions src/test/compile-fail/symbol-names/issue-32709.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(question_mark)]

// Make sure that the span of try shorthand does not include the trailing
// semicolon;
fn a() -> Result<i32, ()> {
Err(5)?; //~ ERROR 16:5: 16:12
Ok(1)
}

fn main() {}

0 comments on commit 05e4116

Please sign in to comment.