Skip to content

Commit f5657f3

Browse files
committed
change magic number unclosed_delimiter_show_limit to const
Signed-off-by: xizheyin <[email protected]>
1 parent d32539a commit f5657f3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

compiler/rustc_parse/src/lexer/tokentrees.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use super::diagnostics::{
88
};
99
use super::{Lexer, UnmatchedDelim};
1010

11+
const UNCLOSED_DELIMITER_SHOW_LIMIT: usize = 5;
12+
1113
impl<'psess, 'src> Lexer<'psess, 'src> {
1214
// Lex into a token stream. The `Spacing` in the result is that of the
1315
// opening delimiter.
@@ -55,8 +57,7 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
5557
let msg = "this file contains an unclosed delimiter";
5658
let mut err = self.dcx().struct_span_err(self.token.span, msg);
5759

58-
let unclosed_delimiter_show_limit = 5;
59-
let len = usize::min(unclosed_delimiter_show_limit, self.diag_info.open_delimiters.len());
60+
let len = usize::min(UNCLOSED_DELIMITER_SHOW_LIMIT, self.diag_info.open_delimiters.len());
6061
for &(_, span) in &self.diag_info.open_delimiters[..len] {
6162
err.span_label(span, "unclosed delimiter");
6263
self.diag_info.unmatched_delims.push(UnmatchedDelim {
@@ -67,14 +68,14 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
6768
});
6869
}
6970

70-
if let Some((_, span)) = self.diag_info.open_delimiters.get(unclosed_delimiter_show_limit)
71-
&& self.diag_info.open_delimiters.len() >= unclosed_delimiter_show_limit + 2
71+
if let Some((_, span)) = self.diag_info.open_delimiters.get(UNCLOSED_DELIMITER_SHOW_LIMIT)
72+
&& self.diag_info.open_delimiters.len() >= UNCLOSED_DELIMITER_SHOW_LIMIT + 2
7273
{
7374
err.span_label(
7475
*span,
7576
format!(
7677
"another {} unclosed delimiters begin from here",
77-
self.diag_info.open_delimiters.len() - unclosed_delimiter_show_limit
78+
self.diag_info.open_delimiters.len() - UNCLOSED_DELIMITER_SHOW_LIMIT
7879
),
7980
);
8081
}

0 commit comments

Comments
 (0)