Commit e4abe76

authored

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

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

2 parents 51ff895 + f696cd8 commit e4abe76Copy full SHA for e4abe76

File tree

2 files changed

+15

-18

lines changed

compiler/rustc_errors/src
- lib.rs
src/tools/clippy/tests/ui
- bool_assert_comparison.stderr

2 files changed

+15

-18

lines changed

`‎compiler/rustc_errors/src/lib.rs`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,11 @@ impl CodeSuggestion {`
`378`	`378`	`})`
`379`	`379`	`.cloned()`
`380`	`380`	`.filter_map(\|mut substitution\| {`
	`381`	`+ // Account for cases where we are suggesting the same code that's already`
	`382`	`+ // there. This shouldn't happen often, but in some cases for multipart`
	`383`	`+ // suggestions it's much easier to handle it here than in the origin.`
	`384`	`+ substitution.parts.retain(\|p\| is_different(sm, &p.snippet, p.span));`
	`385`	`+`
`381`	`386`	`// Assumption: all spans are in the same file, and all spans`
`382`	`387`	`// are disjoint. Sort in ascending order.`
`383`	`388`	`substitution.parts.sort_by_key(\|part\| part.span.lo());`
`@@ -470,16 +475,12 @@ impl CodeSuggestion {`
`470`	`475`	`_ => 1,`
`471`	`476`	`})`
`472`	`477`	`.sum();`
`473`		`- if !is_different(sm, &part.snippet, part.span) {`
`474`		`- // Account for cases where we are suggesting the same code that's already`
`475`		`- // there. This shouldn't happen often, but in some cases for multipart`
`476`		`- // suggestions it's much easier to handle it here than in the origin.`
`477`		`- } else {`
`478`		`- line_highlight.push(SubstitutionHighlight {`
`479`		`- start: (cur_lo.col.0 as isize + acc) as usize,`
`480`		`- end: (cur_lo.col.0 as isize + acc + len) as usize,`
`481`		`- });`
`482`		`- }`
	`478`	`+`
	`479`	`+ line_highlight.push(SubstitutionHighlight {`
	`480`	`+ start: (cur_lo.col.0 as isize + acc) as usize,`
	`481`	`+ end: (cur_lo.col.0 as isize + acc + len) as usize,`
	`482`	`+ });`
	`483`	`+`
`483`	`484`	`buf.push_str(&part.snippet);`
`484`	`485`	`let cur_hi = sm.lookup_char_pos(part.span.hi());`
`485`	`486`	`// Account for the difference between the width of the current code and the`

`‎src/tools/clippy/tests/ui/bool_assert_comparison.stderr`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,8 @@ LL \| assert_eq!(a!(), true);`
`272`	`272`	`\|`
`273`	`273`	help: replace it with `assert!(..)`
`274`	`274`	`\|`
`275`		`-LL \| true`
`276`		`-...`
`277`		`-LL \|`
`278`		`-LL ~ assert!(a!());`
	`275`	`+LL - assert_eq!(a!(), true);`
	`276`	`+LL + assert!(a!());`
`279`	`277`	`\|`
`280`	`278`
`281`	`279`	error: used `assert_eq!` with a literal bool
`@@ -286,10 +284,8 @@ LL \| assert_eq!(true, b!());`
`286`	`284`	`\|`
`287`	`285`	help: replace it with `assert!(..)`
`288`	`286`	`\|`
`289`		`-LL \| true`
`290`		`-...`
`291`		`-LL \|`
`292`		`-LL ~ assert!(b!());`
	`287`	`+LL - assert_eq!(true, b!());`
	`288`	`+LL + assert!(b!());`
`293`	`289`	`\|`
`294`	`290`
`295`	`291`	error: used `debug_assert_eq!` with a literal bool

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e4abe76

File tree

2 files changed

2 files changed

`‎compiler/rustc_errors/src/lib.rs`

`‎src/tools/clippy/tests/ui/bool_assert_comparison.stderr`

0 commit comments