]> git.lizzy.rs Git - rust.git/commit
Auto merge of #106916 - lukas-code:overlapping-substs, r=estebank
authorbors <bors@rust-lang.org>
Sat, 28 Jan 2023 10:00:56 +0000 (10:00 +0000)
committerbors <bors@rust-lang.org>
Sat, 28 Jan 2023 10:00:56 +0000 (10:00 +0000)
commitd8da51366817317d19be9bd138943eafb30bc987
tree23ff9c0cf43972239454598d7d21506a641ba43b
parent226b2496fc3ef997fa1cccf84259539203f82375
parent228ddf04fca01e8224ad4fb8a8e9db8483642249
Auto merge of #106916 - lukas-code:overlapping-substs, r=estebank

Remove overlapping parts of multipart suggestions

This PR adds a debug assertion that the parts of a single substitution cannot overlap, fixes a overlapping substitution from the testsuite, and fixes https://github.com/rust-lang/rust/issues/106870.

Note that a single suggestion can still have multiple overlapping substitutions / possible edits, we just don't suggest overlapping replacements in a single edit anymore.

I've also included a fix for an unrelated bug where rustfix for `explicit_outlives_requirements` would produce multiple trailing commas for a where clause.
compiler/rustc_lint/src/builtin.rs
src/tools/clippy/clippy_lints/src/format_args.rs