fix: Filter suggestion parts that match existing code #146121

Muscraft · 2025-09-02T13:21:23Z

While testing my changes to make rustc use annotate-snippets, I encountered a new clippy test failure stemming from two suggestion output changes in #145273. The new output in these two cases feels like a regression as it is not as clear as the old output, and adds unnecessary information.

Before #145273 (Diff style)

After #145273 ("multi-line" style)

The reason for the change was that a new suggestion part (which matches existing code) was added on a different line than the existing parts, causing the suggestion style to change from Diff to "multi-line". Since this new part matches existing code, no code changes show up in the output for it, but it still makes the suggestion style "multi-line" when it doesn't need to be.

To get the old output back, I made it so that suggestion parts that perfectly match existing code get filtered out.

try-job: aarch64-apple

rustbot · 2025-09-02T13:21:27Z

r? @petrochenkov

rustbot has assigned @petrochenkov.
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

rustbot · 2025-09-02T13:21:30Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

petrochenkov · 2025-09-02T13:48:53Z

@bors r+

bors · 2025-09-02T13:48:57Z

📌 Commit f696cd8 has been approved by petrochenkov

It is now in the queue for this repository.

…r=petrochenkov fix: Filter suggestion parts that match existing code While testing my changes to make `rustc` use `annotate-snippets`, I encountered a new `clippy` test failure stemming from [two](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R275-R278) [suggestion](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R289-R292) output changes in rust-lang#145273. The new output in these two cases feels like a regression as it is not as clear as the old output, and adds unnecessary information. Before rust-lang#145273 (`Diff` style) ![before](https://github.com/user-attachments/assets/36f33635-cbce-45f1-823d-0cbe6f0cfe46) After rust-lang#145273 ("multi-line" style) ![after](https://github.com/user-attachments/assets/d4cb00b8-5a42-436e-9329-db84347138f0) The reason for the change was that a new suggestion part (which matches existing code) was added on a different line than the existing parts, causing the suggestion style to change from `Diff` to "multi-line". Since this new part matches existing code, no code changes show up in the output for it, but it still makes the suggestion style "multi-line" when it doesn't need to be. To get the old output back, I made it so that suggestion parts that perfectly match existing code get filtered out.

Rollup of 8 pull requests Successful merges: - #139113 (unstable book: in a sanitizer example, check the code) - #145823 (editorconfig: don't use nonexistent syntax) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #146032 (Explicity disable LSX feature for `loongarch64-unknown-none` target) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146120 (Correct typo in `rustc_errors` comment) - #146121 (fix: Filter suggestion parts that match existing code) - #146134 (llvm: nvptx: Layout update to match LLVM) r? `@ghost` `@rustbot` modify labels: rollup

…r=petrochenkov fix: Filter suggestion parts that match existing code While testing my changes to make `rustc` use `annotate-snippets`, I encountered a new `clippy` test failure stemming from [two](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R275-R278) [suggestion](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R289-R292) output changes in rust-lang#145273. The new output in these two cases feels like a regression as it is not as clear as the old output, and adds unnecessary information. Before rust-lang#145273 (`Diff` style) ![before](https://github.com/user-attachments/assets/36f33635-cbce-45f1-823d-0cbe6f0cfe46) After rust-lang#145273 ("multi-line" style) ![after](https://github.com/user-attachments/assets/d4cb00b8-5a42-436e-9329-db84347138f0) The reason for the change was that a new suggestion part (which matches existing code) was added on a different line than the existing parts, causing the suggestion style to change from `Diff` to "multi-line". Since this new part matches existing code, no code changes show up in the output for it, but it still makes the suggestion style "multi-line" when it doesn't need to be. To get the old output back, I made it so that suggestion parts that perfectly match existing code get filtered out.

jieyouxu · 2025-09-03T05:04:55Z

This probably also fixes (or at least suppresses tests/crashes/131762.rs): #146139 (comment)

Could you convert it into a ui test or remove if redundant?

@bors r-

jieyouxu · 2025-09-03T05:05:05Z

(Let me double-check)

@bors try jobs=aarch64-apple

fix: Filter suggestion parts that match existing code try-job: aarch64-apple

Muscraft · 2025-09-03T15:19:59Z

I have been unable to reproduce the test failure on my Mac locally, so I might have to use try builds to figure it out.

@bors try jobs=aarch64-apple

fix: Filter suggestion parts that match existing code try-job: aarch64-apple

petrochenkov · 2025-09-05T12:13:39Z

@bors r+

bors · 2025-09-05T12:13:42Z

📌 Commit b307a11 has been approved by petrochenkov

It is now in the queue for this repository.

…r=petrochenkov fix: Filter suggestion parts that match existing code While testing my changes to make `rustc` use `annotate-snippets`, I encountered a new `clippy` test failure stemming from [two](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R275-R278) [suggestion](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R289-R292) output changes in rust-lang#145273. The new output in these two cases feels like a regression as it is not as clear as the old output, and adds unnecessary information. Before rust-lang#145273 (`Diff` style) ![before](https://github.com/user-attachments/assets/36f33635-cbce-45f1-823d-0cbe6f0cfe46) After rust-lang#145273 ("multi-line" style) ![after](https://github.com/user-attachments/assets/d4cb00b8-5a42-436e-9329-db84347138f0) The reason for the change was that a new suggestion part (which matches existing code) was added on a different line than the existing parts, causing the suggestion style to change from `Diff` to "multi-line". Since this new part matches existing code, no code changes show up in the output for it, but it still makes the suggestion style "multi-line" when it doesn't need to be. To get the old output back, I made it so that suggestion parts that perfectly match existing code get filtered out. try-job: aarch64-apple

Rollup of 4 pull requests Successful merges: - #138944 (Add `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast` symbols) - #146041 (tidy: --bless now makes escheck run with --fix) - #146121 (fix: Filter suggestion parts that match existing code) - #146241 (rustc_infer: change top-level doc comment to inner) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-09-05T17:32:00Z

⌛ Testing commit b307a11 with merge 99317ef...

bors · 2025-09-05T20:39:56Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 99317ef to master...

Rollup of 4 pull requests Successful merges: - #138944 (Add `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast` symbols) - #146041 (tidy: --bless now makes escheck run with --fix) - #146121 (fix: Filter suggestion parts that match existing code) - #146241 (rustc_infer: change top-level doc comment to inner) r? `@ghost` `@rustbot` modify labels: rollup

github-actions · 2025-09-05T20:43:00Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 9cd272d (parent) -> 99317ef (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 99317ef14d0be42fa4039eea7c5ce50cb4e9aee7 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-aarch64-linux: 8950.7s -> 6408.0s (-28.4%)
dist-various-1: 3687.6s -> 4222.4s (14.5%)
x86_64-rust-for-linux: 2552.0s -> 2864.5s (12.2%)
x86_64-gnu-stable: 7912.3s -> 7049.0s (-10.9%)
i686-gnu-nopt-1: 7251.2s -> 7998.3s (10.3%)
x86_64-gnu-llvm-19-3: 6371.6s -> 6969.0s (9.4%)
dist-apple-various: 4092.4s -> 4461.9s (9.0%)
aarch64-gnu-llvm-19-1: 3342.3s -> 3634.6s (8.7%)
armhf-gnu: 5128.8s -> 4718.9s (-8.0%)
i686-gnu-2: 5430.2s -> 5859.7s (7.9%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-09-05T21:51:45Z

Finished benchmarking commit (99317ef): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.6%, secondary -2.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	2.4%	[2.4%, 2.4%]	1
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-3.2%	[-5.5%, -2.1%]	4
All ❌✅ (primary)	1.6%	[-0.7%, 3.9%]	2

Cycles

Results (primary 2.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 466.363s -> 468.222s (0.40%)
Artifact size: 390.44 MiB -> 390.57 MiB (0.03%)

…petrochenkov fix: Filter suggestion parts that match existing code While testing my changes to make `rustc` use `annotate-snippets`, I encountered a new `clippy` test failure stemming from [two](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R275-R278) [suggestion](https://github.com/rust-lang/rust/pull/145273/files#diff-6e8403e31463539666afbc00479cb416dc767a518f562b6e2960630953ee7da2R289-R292) output changes in rust-lang#145273. The new output in these two cases feels like a regression as it is not as clear as the old output, and adds unnecessary information. Before rust-lang#145273 (`Diff` style) ![before](https://github.com/user-attachments/assets/36f33635-cbce-45f1-823d-0cbe6f0cfe46) After rust-lang#145273 ("multi-line" style) ![after](https://github.com/user-attachments/assets/d4cb00b8-5a42-436e-9329-db84347138f0) The reason for the change was that a new suggestion part (which matches existing code) was added on a different line than the existing parts, causing the suggestion style to change from `Diff` to "multi-line". Since this new part matches existing code, no code changes show up in the output for it, but it still makes the suggestion style "multi-line" when it doesn't need to be. To get the old output back, I made it so that suggestion parts that perfectly match existing code get filtered out. try-job: aarch64-apple

…arts, r=petrochenkov" This reverts commit 99317ef, reversing changes made to 9cd272d.

Revert "fix: Filter suggestion parts that match existing code" As requested by `@wesleywiser` in #147973 (comment) this is a revert of #146121 due to the handful of diagnostics ICEs that have been since reported, and found in the beta crater run. This should thus also be backported to beta so the ICEs don't make it to next week's stable. Works around (after backport) - #146261 - #146706 - #146834 but I didn't add a test for this allowed-by-default lint - as well as the crater run regressions from #147973 of which I only added the MCVE as a test. The proper fix would likely be #147849 but it's still currently at the MCP stage. In the meantime, this PR would still emit the same overlapping suggestions, but still use a debug-assert... r? `@wesleywiser`

…arts, r=petrochenkov" This reverts commit 99317ef, reversing changes made to 9cd272d. (cherry picked from commit a2b4833)

Revert "fix: Filter suggestion parts that match existing code" As requested by `@wesleywiser` in rust-lang/rust#147973 (comment) this is a revert of rust-lang/rust#146121 due to the handful of diagnostics ICEs that have been since reported, and found in the beta crater run. This should thus also be backported to beta so the ICEs don't make it to next week's stable. Works around (after backport) - rust-lang/rust#146261 - rust-lang/rust#146706 - rust-lang/rust#146834 but I didn't add a test for this allowed-by-default lint - as well as the crater run regressions from rust-lang/rust#147973 of which I only added the MCVE as a test. The proper fix would likely be rust-lang/rust#147849 but it's still currently at the MCP stage. In the meantime, this PR would still emit the same overlapping suggestions, but still use a debug-assert... r? `@wesleywiser`

rustbot assigned petrochenkov Sep 2, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 2, 2025

bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 2, 2025

GuillaumeGomez mentioned this pull request Sep 2, 2025

Rollup of 8 pull requests #146139

Closed

tgross35 mentioned this pull request Sep 3, 2025

Rollup of 9 pull requests #146142

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 3, 2025

rust-bors bot added a commit that referenced this pull request Sep 3, 2025

Auto merge of #146121 - Muscraft:filter-suggestion-parts, r=<try>

e4abe76

fix: Filter suggestion parts that match existing code try-job: aarch64-apple

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

Muscraft force-pushed the filter-suggestion-parts branch from f696cd8 to 3f529cf Compare September 3, 2025 14:28

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Sep 3, 2025

Auto merge of #146121 - Muscraft:filter-suggestion-parts, r=<try>

51348b8

fix: Filter suggestion parts that match existing code try-job: aarch64-apple

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2025

bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2025

matthiaskrgr mentioned this pull request Sep 5, 2025

Rollup of 4 pull requests #146244

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2025

bors merged commit 99317ef into rust-lang:master Sep 5, 2025
11 checks passed

rustbot added this to the 1.91.0 milestone Sep 5, 2025

matthiaskrgr mentioned this pull request Sep 6, 2025

ICE: all spans must be disjoint #146261

Open

Muscraft deleted the filter-suggestion-parts branch September 16, 2025 06:25

This was referenced Sep 19, 2025

ICE：assertion left == right failed: all spans must be disjoint #146706

Open

ICE: all spans must be disjoint (single-use-lifetimes) #146834

Open

theemathas mentioned this pull request Oct 23, 2025

regression: ICE all spans must be disjoint #147973

Closed

lqd added a commit to lqd/rust that referenced this pull request Oct 23, 2025

Revert "Auto merge of rust-lang#146121 - Muscraft:filter-suggestion-p…

a2d54a2

…arts, r=petrochenkov" This reverts commit 99317ef, reversing changes made to 9cd272d.

lqd mentioned this pull request Oct 23, 2025

Revert "fix: Filter suggestion parts that match existing code" #148043

Merged

lqd added a commit to lqd/rust that referenced this pull request Oct 23, 2025

Revert "Auto merge of rust-lang#146121 - Muscraft:filter-suggestion-p…

a2b4833

…arts, r=petrochenkov" This reverts commit 99317ef, reversing changes made to 9cd272d.

Uh oh!

fix: Filter suggestion parts that match existing code #146121

fix: Filter suggestion parts that match existing code #146121

Uh oh!

Conversation

Muscraft commented Sep 2, 2025 • edited by Kobzol Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 2, 2025

Uh oh!

rustbot commented Sep 2, 2025

Uh oh!

petrochenkov commented Sep 2, 2025

Uh oh!

bors commented Sep 2, 2025

Uh oh!

jieyouxu commented Sep 3, 2025

Uh oh!

jieyouxu commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment was marked as resolved.

This comment has been minimized.

Muscraft commented Sep 3, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Sep 5, 2025

Uh oh!

bors commented Sep 5, 2025

Uh oh!

bors commented Sep 5, 2025

Uh oh!

bors commented Sep 5, 2025

Uh oh!

Uh oh!

github-actions bot commented Sep 5, 2025

Test differences

Job duration changes

Uh oh!

rust-timer commented Sep 5, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Muscraft commented Sep 2, 2025 •

edited by Kobzol

Loading

jieyouxu commented Sep 3, 2025 •

edited

Loading