Skip to content

remove unnecessary variables and delimiter check #154235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Apr 8, 2026
+4 −7
Merged

remove unnecessary variables and delimiter check #154235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions compiler/rustc_parse/src/lexer/tokentrees.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
let close_spacing = if let Some(close_delim) = self.token.kind.close_delim() {
if close_delim == open_delim {
// Correct delimiter.
let (open_delimiter, open_delimiter_span) =
self.diag_info.open_delimiters.pop().unwrap();
self.diag_info.open_delimiters.pop().unwrap();
let close_delimiter_span = self.token.span;

if tts.is_empty() && close_delim == Delimiter::Brace {
let empty_block_span = open_delimiter_span.to(close_delimiter_span);
let empty_block_span = pre_span.to(close_delimiter_span);
if !sm.is_multiline(empty_block_span) {
// Only track if the block is in the form of `{}`, otherwise it is
// likely that it was written on purpose.
Expand All @@ -86,11 +85,9 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
}

// only add braces
if let (Delimiter::Brace, Delimiter::Brace) = (open_delimiter, open_delim) {
if Delimiter::Brace == open_delim {
// Add all the matching spans, we will sort by span later
self.diag_info
.matching_block_spans
.push((open_delimiter_span, close_delimiter_span));
self.diag_info.matching_block_spans.push((pre_span, close_delimiter_span));
}

// Move past the closing delimiter.
Expand Down
Loading