diff options
| author | bors <bors@rust-lang.org> | 2025-09-05 17:31:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-05 17:31:56 +0000 |
| commit | 99317ef14d0be42fa4039eea7c5ce50cb4e9aee7 (patch) | |
| tree | 1f55914225100e3fdb6031057dfc2c588079cf67 /src/tools | |
| parent | 9cd272dc85320e85a8c83a1a338870de52c005f3 (diff) | |
| parent | b307a1146b4af3b5808510e44a13f56f2b0252e9 (diff) | |
| download | rust-99317ef14d0be42fa4039eea7c5ce50cb4e9aee7.tar.gz rust-99317ef14d0be42fa4039eea7c5ce50cb4e9aee7.zip | |
Auto merge of #146121 - Muscraft:filter-suggestion-parts, 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/rust#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/rust#145273 (`Diff` style)
After rust-lang/rust#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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/tests/ui/bool_assert_comparison.stderr | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/tools/clippy/tests/ui/bool_assert_comparison.stderr b/src/tools/clippy/tests/ui/bool_assert_comparison.stderr index f823f08f31d..72aa6303a20 100644 --- a/src/tools/clippy/tests/ui/bool_assert_comparison.stderr +++ b/src/tools/clippy/tests/ui/bool_assert_comparison.stderr @@ -272,10 +272,8 @@ LL | assert_eq!(a!(), true); | help: replace it with `assert!(..)` | -LL | true -... -LL | -LL ~ assert!(a!()); +LL - assert_eq!(a!(), true); +LL + assert!(a!()); | error: used `assert_eq!` with a literal bool @@ -286,10 +284,8 @@ LL | assert_eq!(true, b!()); | help: replace it with `assert!(..)` | -LL | true -... -LL | -LL ~ assert!(b!()); +LL - assert_eq!(true, b!()); +LL + assert!(b!()); | error: used `debug_assert_eq!` with a literal bool |