Skip to content

Commit 4e5ddf1

Browse files
committed
Invert is_top_level to avoid negation.
1 parent a822d08 commit 4e5ddf1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

compiler/rustc_parse/src/lexer/tokentrees.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ impl<'a> TokenTreesReader<'a> {
4040
last_delim_empty_block_spans: FxHashMap::default(),
4141
matching_block_spans: Vec::new(),
4242
};
43-
let res = tt_reader.parse_token_trees(/* is_top_level */ true);
43+
let res = tt_reader.parse_token_trees(/* is_delimited */ false);
4444
(res, tt_reader.unmatched_braces)
4545
}
4646

4747
// Parse a stream of tokens into a list of `TokenTree`s.
48-
fn parse_token_trees(&mut self, is_top_level: bool) -> PResult<'a, TokenStream> {
48+
fn parse_token_trees(&mut self, is_delimited: bool) -> PResult<'a, TokenStream> {
4949
self.token = self.string_reader.next_token().0;
5050
let mut buf = Vec::new();
5151
loop {
5252
match self.token.kind {
5353
token::OpenDelim(delim) => buf.push(self.parse_token_tree_open_delim(delim)),
5454
token::CloseDelim(delim) => {
55-
return if !is_top_level {
55+
return if is_delimited {
5656
Ok(TokenStream::new(buf))
5757
} else {
5858
Err(self.close_delim_err(delim))
5959
};
6060
}
6161
token::Eof => {
62-
if !is_top_level {
62+
if is_delimited {
6363
self.eof_err().emit();
6464
}
6565
return Ok(TokenStream::new(buf));
@@ -133,7 +133,7 @@ impl<'a> TokenTreesReader<'a> {
133133
// Parse the token trees within the delimiters.
134134
// We stop at any delimiter so we can try to recover if the user
135135
// uses an incorrect delimiter.
136-
let tts = self.parse_token_trees(/* is_top_level */ false).unwrap();
136+
let tts = self.parse_token_trees(/* is_delimited */ true).unwrap();
137137

138138
// Expand to cover the entire delimited token tree
139139
let delim_span = DelimSpan::from_pair(pre_span, self.token.span);

0 commit comments

Comments
 (0)