Auto merge of #28455 - nrc:span-bang, r=alexcrichton

bors · bors · commit c9fc4efd24ed · 2015-09-17T12:58:22.000Z
I can't see how to test this. Fixes https://github.com/nrc/rustfmt/issues/320
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -1263,7 +1263,7 @@ impl<'a> Parser<'a> {
     pub fn parse_ret_ty(&mut self) -> PResult<FunctionRetTy> {
         if try!(self.eat(&token::RArrow) ){
             if try!(self.eat(&token::Not) ){
-                Ok(NoReturn(self.span))
+                Ok(NoReturn(self.last_span))
             } else {
                 Ok(Return(try!(self.parse_ty_nopanic())))
             }

Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@ impl<'a> Parser<'a> {`
`1263`	`1263`	`pub fn parse_ret_ty(&mut self) -> PResult<FunctionRetTy> {`
`1264`	`1264`	`if try!(self.eat(&token::RArrow) ){`
`1265`	`1265`	`if try!(self.eat(&token::Not) ){`
`1266`		`- Ok(NoReturn(self.span))`
	`1266`	`+ Ok(NoReturn(self.last_span))`
`1267`	`1267`	`} else {`
`1268`	`1268`	`Ok(Return(try!(self.parse_ty_nopanic())))`
`1269`	`1269`	`}`