Skip to content

Normalize rustc path prefix when testing -Z track-diagnostics - #154394

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
aDotInTheVoid:in-one-word-he-told-me-secret-of-success-in-testing-normalize
Mar 28, 2026
Merged

Normalize rustc path prefix when testing -Z track-diagnostics#154394
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
aDotInTheVoid:in-one-word-he-told-me-secret-of-success-in-testing-normalize

Conversation

@aDotInTheVoid

Copy link
Copy Markdown
Member

Fixes#154392

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 25, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: rustdoc
  • rustdoc expanded to 9 candidates
  • Random selection from GuillaumeGomez, camelid, fmease, lolbinarycat, notriddle

@fmeasefmease left a comment

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.

Thanks! r=me with the normalization rule the other tests use unless you like yours better and want to keep it.

@bors rollup

View changes since this review

// Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line.
//@ normalize-stderr: ".rs:\d+:\d+" -> ".rs:LL:CC"
//@ normalize-stderr: "created at .*compiler/" -> "created at compiler/"

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.

FYI, the tests in tests/ui/track-diagnostics use the following normalization rule instead:

//@ normalize-stderr: "/rustc(?:-dev)?/[a-z0-9.]+/" -> ""

@fmeasefmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 27, 2026
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the in-one-word-he-told-me-secret-of-success-in-testing-normalize branch from 18ff350 to d10baaeCompareMarch 28, 2026 12:02
@aDotInTheVoid

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease

@rust-bors

rust-borsBot commented Mar 28, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d10baae has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 28, 2026
@RalfJungRalfJung mentioned this pull request Mar 28, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 28, 2026
Rollup of 11 pull requests
Successful merges:
- #152880 (Tweak incorrect assoc item note)
- #153526 (Fix LegacyKeyValueFormat report from docker build: i686)
- #153613 (interpreter error reporting: remove arguments that are always the same)
- #154029 (Replace `truncate(0)` with `clear()`)
- #154125 (Inline and remove `DepGraphData::try_mark_parent_green`.)
- #154185 (Prevent no_threads RwLock's write() impl from setting mode to -1 when it is locked for reading)
- #154394 (Normalize rustc path prefix when testing `-Z track-diagnostics`)
- #154450 (Use the normal arg-parsing machinery for `-Zassert-incr-state`)
- #154475 (Emit a pre-expansion feature gate warning for `box`'ed struct field patterns)
- #154500 (EnumSizeOpt: use Allocation::write_scalar instead of manual endianess logic)
- #154502 (interpret: ensure that untupled arguments are actually tuples)
@rust-bors
rust-borsBot merged commit d400f17 into rust-lang:mainMar 28, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 28, 2026
rust-timer added a commit that referenced this pull request Mar 28, 2026
Rollup merge of #154394 - aDotInTheVoid:in-one-word-he-told-me-secret-of-success-in-testing-normalize, r=fmease
Normalize rustc path prefix when testing `-Z track-diagnostics`
Fixes#154392
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tests/rustdoc-ui fails on main with profile = "tools" due to normalization.

3 participants

@aDotInTheVoid@rustbot@fmease