Skip to content

Normalize indentation of rustc suggestion lines #319

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
dtolnay merged 2 commits into from
Nov 7, 2025
Merged

Normalize indentation of rustc suggestion lines #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c610b40
Add test that reproduces misalignment of help under note
dtolnay Nov 7, 2025
781a773
Normalize indentation of rustc suggestion lines
dtolnay Nov 7, 2025
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
9 changes: 9 additions & 0 deletions src/normalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ normalizations! {
UnindentMultilineNote,
DependencyVersion,
HeadingNote,
UnindentSuggestion,
// New normalization steps are to be inserted here at the end so that any
// snapshots saved before your normalization change remain passing.
}
Expand Down Expand Up @@ -669,6 +670,14 @@ fn indented_line_kind(
if spaces > 0
&& (rest == "|"
|| rest.starts_with("| ")
|| normalization >= UnindentSuggestion
&& digits > 0
&& (rest == "~"
|| rest.starts_with("~ ")
|| rest == "+"
|| rest.starts_with("+ ")
|| rest == "-"
|| rest.starts_with("- "))
|| digits == 0
&& (rest.starts_with("--> ") || rest.starts_with("::: ") || rest.starts_with("= ")))
{
Expand Down
41 changes: 41 additions & 0 deletions src/tests/ghost-note-help.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
test_normalize! {"
error[E0004]: non-exhaustive patterns: `MyPhantom::__Phantom(_)` not covered
--> src/main.rs:9:11
|
9 | match phantom {
| ^^^^^^^ pattern `MyPhantom::__Phantom(_)` not covered
|
note: `MyPhantom<u8>` defined here
--> src/main.rs:4:8
|
3 | #[phantom]
| ---------- not covered
4 | struct MyPhantom<T: ?Sized>;
| ^^^^^^^^^
= note: the matched value is of type `MyPhantom<u8>`
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
|
10 ~ MyPhantom => {},
11 + MyPhantom::__Phantom(_) => todo!()
|
" "
error[E0004]: non-exhaustive patterns: `MyPhantom::__Phantom(_)` not covered
--> src/main.rs:9:11
|
9 | match phantom {
| ^^^^^^^ pattern `MyPhantom::__Phantom(_)` not covered
|
note: `MyPhantom<u8>` defined here
--> src/main.rs:4:8
|
3 | #[phantom]
| ---------- not covered
4 | struct MyPhantom<T: ?Sized>;
| ^^^^^^^^^
= note: the matched value is of type `MyPhantom<u8>`
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
|
10 ~ MyPhantom => {},
11 + MyPhantom::__Phantom(_) => todo!()
|
"}