bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Address review comments.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-09-28 10:28:36 +10:00
parent 7f7e2165b1
commit d0a26acb2a
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -4,8 +4,8 @@ use rustc_ast::token::{self, CommentKind, Delimiter, Token, TokenKind};
use rustc_ast::tokenstream::TokenStream;
use rustc_ast::util::unicode::contains_text_flow_control_chars;
use rustc_errors::{error_code, Applicability, DiagnosticBuilder, ErrorGuaranteed, PResult};
use rustc_lexer::cursor::Cursor;
use rustc_lexer::unescape::{self, Mode};
use rustc_lexer::Cursor;
use rustc_lexer::{Base, DocStyle, RawStrError};
use rustc_session::lint::builtin::{
RUST_2021_PREFIXES_INCOMPATIBLE_SYNTAX, TEXT_DIRECTION_CODEPOINT_IN_COMMENT,

14
compiler/rustc_parse/src/lexer/tokentrees.rs
View file

@ -53,7 +53,7 @@ impl<'a> TokenTreesReader<'a> {
token::OpenDelim(delim) => buf.push(self.parse_token_tree_open_delim(delim)),
token::CloseDelim(delim) => return Err(self.close_delim_err(delim)),
token::Eof => return Ok(buf.into_token_stream()),
_ => buf.push(self.parse_token_tree_other()),
_ => buf.push(self.parse_token_tree_non_delim_non_eof()),
}
}
}
@ -66,11 +66,10 @@ impl<'a> TokenTreesReader<'a> {
token::OpenDelim(delim) => buf.push(self.parse_token_tree_open_delim(delim)),
token::CloseDelim(..) => return buf.into_token_stream(),
token::Eof => {
let mut err = self.eof_err();
err.emit();
self.eof_err().emit();
return buf.into_token_stream();
}
_ => buf.push(self.parse_token_tree_other()),
_ => buf.push(self.parse_token_tree_non_delim_non_eof()),
}
}
}
@ -245,9 +244,10 @@ impl<'a> TokenTreesReader<'a> {
}
#[inline]
fn parse_token_tree_other(&mut self) -> TokenTree {
// `spacing` for the returned token is determined by the next token:
// its kind and its `preceded_by_whitespace` status.
fn parse_token_tree_non_delim_non_eof(&mut self) -> TokenTree {
// `this_spacing` for the returned token refers to whether the token is
// immediately followed by another op token. It is determined by the
// next token: its kind and its `preceded_by_whitespace` status.
let (next_tok, is_next_tok_preceded_by_whitespace) = self.string_reader.next_token();
let this_spacing = if is_next_tok_preceded_by_whitespace || !next_tok.is_op() {
Spacing::Alone