Skip to content

Commit 250886f

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#121107
Rollup merge of rust-lang#121107 - estebank:capitalization-suggestion, r=michaelwoerister Fix msg for verbose suggestions with confusable capitalization When encountering a verbose/multipart suggestion that has changes that are only caused by different capitalization of ASCII letters that have little differenciation, expand the message to highlight that fact (like we already do for inline suggestions). The logic to do this was already present, but implemented incorrectly.
2 parents 62fb0db + 8d4d572 commit 250886f

9 files changed

+26
-24
lines changed

‎compiler/rustc_errors/src/emitter.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -1743,9 +1743,17 @@ impl HumanEmitter {
17431743
buffer.append(0, level.to_str(), Style::Level(*level));
17441744
buffer.append(0, ": ", Style::HeaderMsg);
17451745

1746+
let mut msg = vec![(suggestion.msg.to_owned(), Style::NoStyle)];
1747+
if suggestions
1748+
.iter()
1749+
.take(MAX_SUGGESTIONS)
1750+
.any(|(_, _, _, only_capitalization)| *only_capitalization)
1751+
{
1752+
msg.push((" (notice the capitalization difference)".into(), Style::NoStyle));
1753+
}
17461754
self.msgs_to_buffer(
17471755
&mut buffer,
1748-
&[(suggestion.msg.to_owned(), Style::NoStyle)],
1756+
&msg,
17491757
args,
17501758
max_line_num_len,
17511759
"suggestion",
@@ -1754,12 +1762,8 @@ impl HumanEmitter {
17541762

17551763
let mut row_num = 2;
17561764
draw_col_separator_no_space(&mut buffer, 1, max_line_num_len + 1);
1757-
let mut notice_capitalization = false;
1758-
for (complete, parts, highlights, only_capitalization) in
1759-
suggestions.iter().take(MAX_SUGGESTIONS)
1760-
{
1765+
for (complete, parts, highlights, _) in suggestions.iter().take(MAX_SUGGESTIONS) {
17611766
debug!(?complete, ?parts, ?highlights);
1762-
notice_capitalization |= only_capitalization;
17631767

17641768
let has_deletion = parts.iter().any(|p| p.is_deletion(sm));
17651769
let is_multiline = complete.lines().count() > 1;
@@ -2058,9 +2062,6 @@ impl HumanEmitter {
20582062
let others = suggestions.len() - MAX_SUGGESTIONS;
20592063
let msg = format!("and {} other candidate{}", others, pluralize!(others));
20602064
buffer.puts(row_num, max_line_num_len + 3, &msg, Style::NoStyle);
2061-
} else if notice_capitalization {
2062-
let msg = "notice the capitalization difference";
2063-
buffer.puts(row_num, max_line_num_len + 3, msg, Style::NoStyle);
20642065
}
20652066
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
20662067
Ok(())

‎compiler/rustc_errors/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,9 @@ impl CodeSuggestion {
320320
// We need to keep track of the difference between the existing code and the added
321321
// or deleted code in order to point at the correct column *after* substitution.
322322
let mut acc = 0;
323+
let mut only_capitalization = false;
323324
for part in &substitution.parts {
325+
only_capitalization |= is_case_difference(sm, &part.snippet, part.span);
324326
let cur_lo = sm.lookup_char_pos(part.span.lo());
325327
if prev_hi.line == cur_lo.line {
326328
let mut count =
@@ -393,7 +395,6 @@ impl CodeSuggestion {
393395
}
394396
}
395397
highlights.push(std::mem::take(&mut line_highlight));
396-
let only_capitalization = is_case_difference(sm, &buf, bounding_span);
397398
// if the replacement already ends with a newline, don't print the next line
398399
if !buf.ends_with('\n') {
399400
push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);

‎src/tools/clippy/tests/ui/match_str_case_mismatch.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ error: this `match` arm has a differing case than its expression
1717
LL | "~!@#$%^&*()-_=+Foo" => {},
1818
| ^^^^^^^^^^^^^^^^^^^^
1919
|
20-
help: consider changing the case of this arm to respect `to_ascii_lowercase`
20+
help: consider changing the case of this arm to respect `to_ascii_lowercase` (notice the capitalization difference)
2121
|
2222
LL | "~!@#$%^&*()-_=+foo" => {},
2323
| ~~~~~~~~~~~~~~~~~~~~

‎tests/ui/error-codes/E0423.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ help: use struct literal syntax instead
5353
|
5454
LL | let f = Foo { a: val };
5555
| ~~~~~~~~~~~~~~
56-
help: a function with a similar name exists
56+
help: a function with a similar name exists (notice the capitalization difference)
5757
|
5858
LL | let f = foo();
5959
| ~~~

‎tests/ui/parser/kw-in-trait-bounds.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: expected identifier, found keyword `fn`
44
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
55
| ^^
66
|
7-
help: use `Fn` to refer to the trait
7+
help: use `Fn` to refer to the trait (notice the capitalization difference)
88
|
99
LL | fn _f<F: Fn(), G>(_: impl fn(), _: &dyn fn())
1010
| ~~
@@ -15,7 +15,7 @@ error: expected identifier, found keyword `fn`
1515
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
1616
| ^^
1717
|
18-
help: use `Fn` to refer to the trait
18+
help: use `Fn` to refer to the trait (notice the capitalization difference)
1919
|
2020
LL | fn _f<F: fn(), G>(_: impl Fn(), _: &dyn fn())
2121
| ~~
@@ -26,7 +26,7 @@ error: expected identifier, found keyword `fn`
2626
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
2727
| ^^
2828
|
29-
help: use `Fn` to refer to the trait
29+
help: use `Fn` to refer to the trait (notice the capitalization difference)
3030
|
3131
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn Fn())
3232
| ~~
@@ -37,7 +37,7 @@ error: expected identifier, found keyword `fn`
3737
LL | G: fn(),
3838
| ^^
3939
|
40-
help: use `Fn` to refer to the trait
40+
help: use `Fn` to refer to the trait (notice the capitalization difference)
4141
|
4242
LL | G: Fn(),
4343
| ~~

‎tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: expected identifier, found keyword `fn`
44
LL | fn foo(_: impl fn() -> i32) {}
55
| ^^
66
|
7-
help: use `Fn` to refer to the trait
7+
help: use `Fn` to refer to the trait (notice the capitalization difference)
88
|
99
LL | fn foo(_: impl Fn() -> i32) {}
1010
| ~~
@@ -15,7 +15,7 @@ error: expected identifier, found keyword `fn`
1515
LL | fn foo2<T: fn(i32)>(_: T) {}
1616
| ^^
1717
|
18-
help: use `Fn` to refer to the trait
18+
help: use `Fn` to refer to the trait (notice the capitalization difference)
1919
|
2020
LL | fn foo2<T: Fn(i32)>(_: T) {}
2121
| ~~

‎tests/ui/parser/typod-const-in-const-param-def.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `const` keyword was mistyped as `Const`
44
LL | pub fn foo<Const N: u8>() {}
55
| ^^^^^
66
|
7-
help: use the `const` keyword
7+
help: use the `const` keyword (notice the capitalization difference)
88
|
99
LL | pub fn foo<const N: u8>() {}
1010
| ~~~~~
@@ -15,7 +15,7 @@ error: `const` keyword was mistyped as `Const`
1515
LL | pub fn baz<Const N: u8, T>() {}
1616
| ^^^^^
1717
|
18-
help: use the `const` keyword
18+
help: use the `const` keyword (notice the capitalization difference)
1919
|
2020
LL | pub fn baz<const N: u8, T>() {}
2121
| ~~~~~
@@ -26,7 +26,7 @@ error: `const` keyword was mistyped as `Const`
2626
LL | pub fn qux<T, Const N: u8>() {}
2727
| ^^^^^
2828
|
29-
help: use the `const` keyword
29+
help: use the `const` keyword (notice the capitalization difference)
3030
|
3131
LL | pub fn qux<T, const N: u8>() {}
3232
| ~~~~~
@@ -37,7 +37,7 @@ error: `const` keyword was mistyped as `Const`
3737
LL | pub fn quux<T, Const N: u8, U>() {}
3838
| ^^^^^
3939
|
40-
help: use the `const` keyword
40+
help: use the `const` keyword (notice the capitalization difference)
4141
|
4242
LL | pub fn quux<T, const N: u8, U>() {}
4343
| ~~~~~

‎tests/ui/suggestions/assoc-ct-for-assoc-method.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | let x: i32 = MyS::foo;
88
|
99
= note: expected type `i32`
1010
found fn item `fn() -> MyS {MyS::foo}`
11-
help: try referring to the associated const `FOO` instead
11+
help: try referring to the associated const `FOO` instead (notice the capitalization difference)
1212
|
1313
LL | let x: i32 = MyS::FOO;
1414
| ~~~

‎tests/ui/suggestions/bool_typo_err_suggest.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ error[E0425]: cannot find value `False` in this scope
1515
LL | let y = False;
1616
| ^^^^^ not found in this scope
1717
|
18-
help: you may want to use a bool value instead
18+
help: you may want to use a bool value instead (notice the capitalization difference)
1919
|
2020
LL | let y = false;
2121
| ~~~~~

0 commit comments

Comments
 (0)