diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-07 13:57:57 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-07 13:57:57 +0300 |
| commit | 3dbee57daee312ee073006101053f5e3934de7c6 (patch) | |
| tree | 3628a44f5e0ae8851ef2d023aaa88b09dc33d3f5 /src/libsyntax/parse/parser.rs | |
| parent | 6eae6b0fe9da99f54f2f4ef1bf604d5e9deb367f (diff) | |
| download | rust-3dbee57daee312ee073006101053f5e3934de7c6.tar.gz rust-3dbee57daee312ee073006101053f5e3934de7c6.zip | |
parser: Remove `look_ahead_span`
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 81013332615..3acd7088145 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1064,18 +1064,6 @@ impl<'a> Parser<'a> { }) } - crate fn look_ahead_span(&self, dist: usize) -> Span { - if dist == 0 { - return self.token.span - } - - match self.token_cursor.frame.tree_cursor.look_ahead(dist - 1) { - Some(TokenTree::Token(token)) => token.span, - Some(TokenTree::Delimited(span, ..)) => span.entire(), - None => self.look_ahead_span(dist - 1), - } - } - /// Returns whether any of the given keywords are `dist` tokens ahead of the current one. fn is_keyword_ahead(&self, dist: usize, kws: &[Symbol]) -> bool { self.look_ahead(dist, |t| kws.iter().any(|&kw| t.is_keyword(kw))) @@ -3067,7 +3055,7 @@ impl<'a> Parser<'a> { let mut err = self.sess.span_diagnostic.struct_span_err(self.token.span, &msg); let span_after_type = parser_snapshot_after_type.token.span; - err.span_label(self.look_ahead_span(1).to(span_after_type), + err.span_label(self.look_ahead(1, |t| t.span).to(span_after_type), "interpreted as generic arguments"); err.span_label(self.token.span, format!("not interpreted as {}", op_noun)); |
