rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove open_span and close_span from Delimited.

Browse Source
This commit is contained in:
Jeffrey Seyfried
2017-01-23 04:58:15 +00:00
parent 31417efcd3
commit 49f5b0a8cf
10 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View File

@@ -254,9 +254,7 @@ impl<'a> Parser<'a> {
-> Self {
let tt = TokenTree::Delimited(syntax_pos::DUMMY_SP, Rc::new(Delimited {
delim: token::NoDelim,
open_span: syntax_pos::DUMMY_SP,
tts: tokens,
close_span: syntax_pos::DUMMY_SP,
}));
let mut parser = Parser {
sess: sess,
@@ -2717,7 +2715,7 @@ impl<'a> Parser<'a> {
}
let parsing_token_tree = ::std::mem::replace(&mut self.parsing_token_tree, true);
let open_span = self.span;
let lo = self.span.lo;
self.bump();
let tts = self.parse_seq_to_before_tokens(&[&token::CloseDelim(token::Brace),
&token::CloseDelim(token::Paren),
@@ -2726,16 +2724,11 @@ impl<'a> Parser<'a> {
|p| p.parse_token_tree(),
|mut e| e.emit());
self.parsing_token_tree = parsing_token_tree;
let close_span = self.span;
self.bump();
let span = Span { lo: open_span.lo, ..close_span };
Ok(TokenTree::Delimited(span, Rc::new(Delimited {
Ok(TokenTree::Delimited(Span { lo: lo, ..self.prev_span }, Rc::new(Delimited {
delim: delim,
open_span: open_span,
tts: tts,
close_span: close_span,
})))
},
token::CloseDelim(_) | token::Eof => unreachable!(),