bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix span for type-only arguments

Browse source
This commit is contained in:
Manish Goregaokar 2018-05-22 13:29:28 -07:00
parent fe63e479d1
commit d7086cac3d
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libsyntax/parse/parser.rs
View file

@ -1761,27 +1761,27 @@ impl<'a> Parser<'a> {
pub fn parse_arg_general(&mut self, require_name: bool) -> PResult<'a, Arg> { pub fn parse_arg_general(&mut self, require_name: bool) -> PResult<'a, Arg> {
maybe_whole!(self, NtArg, |x| x); maybe_whole!(self, NtArg, |x| x);
let pat = if require_name || self.is_named_argument() { let (pat, ty) = if require_name || self.is_named_argument() {
debug!("parse_arg_general parse_pat (require_name:{})", debug!("parse_arg_general parse_pat (require_name:{})",
require_name); require_name);
let pat = self.parse_pat()?; let pat = self.parse_pat()?;
self.expect(&token::Colon)?; self.expect(&token::Colon)?;
pat (pat, self.parse_ty()?)
} else { } else {
debug!("parse_arg_general ident_to_pat"); debug!("parse_arg_general ident_to_pat");
let ident = Ident::new(keywords::Invalid.name(), self.prev_span); let ident = Ident::new(keywords::Invalid.name(), self.prev_span);
P(Pat { let ty = self.parse_ty()?;
let pat = P(Pat {
id: ast::DUMMY_NODE_ID, id: ast::DUMMY_NODE_ID,
node: PatKind::Ident(BindingMode::ByValue(Mutability::Immutable), ident, None), node: PatKind::Ident(BindingMode::ByValue(Mutability::Immutable), ident, None),
span: ident.span, span: ty.span,
}) });
(pat, ty)
}; };
let t = self.parse_ty()?;
Ok(Arg { Ok(Arg {
ty: t, ty,
pat, pat,
id: ast::DUMMY_NODE_ID, id: ast::DUMMY_NODE_ID,
}) })