Skip to content

Make normalization in a test case resilient to dist compilation #158318

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
Jun 25, 2026
+1 −3
Merged

Make normalization in a test case resilient to dist compilation #158318

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/ice-bug-report-url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

//@ normalize-stderr: "note: compiler flags.*\n\n" -> ""
//@ normalize-stderr: "note: rustc.*running on.*" -> "note: rustc {version} running on {platform}"
//@ normalize-stderr: "thread.*panicked at compiler.*" -> ""
//@ normalize-stderr: "thread 'rustc'.*panicked.*:\n.*\n" -> ""
//@ normalize-stderr: " +\d{1,}: .*\n" -> ""
//@ normalize-stderr: " + at .*\n" -> ""
//@ normalize-stderr: ".*note: Some details are omitted.*\n" -> ""
Expand Down
2 changes: 0 additions & 2 deletions tests/rustdoc-ui/ice-bug-report-url.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ LL | fn wrong()
| ^ expected one of `->`, `where`, or `{`



aborting due to `-Z treat-err-as-bug=1`

@camelid camelid Jun 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why this disappeared? Is it some kind of compiletest magic that wasn't working properly before?

@steffahn steffahn Jun 23, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the two extra new lines at the end of the regex.

@steffahn steffahn Jun 23, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I.e. the new normalize-stderr regex ends in .*:\n.*\n removing the extra line (which in general is the panic message or something like that, I think). Among the search results I had already linked above, only half do it that way though.

//@ normalize-stderr: "thread 'rustc'.*panicked.*:\n.*\n" -> ""

The other commonly-used one would have left the aborting due to … line.

//@ normalize-stderr: "thread 'rustc'.*panicked.*\n" -> ""

@steffahn steffahn Jun 23, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be completely honest I had the exact same thought initially, too. "some kind of compiletest magic" seemed plausible. I needed to test things out more times both ways one more time make sure that it works the same in the dist or non-dist branch/folder I had open… and took probably 5+ minutes before realizing that these \ns in the regex are what's doing it.

@camelid camelid Jun 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh that makes sense, thank you.

stack backtrace:

error: the compiler unexpectedly panicked. This is a bug
Expand Down
Loading