rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rollup merge of #142980 - shepmaster:mismatched-syntaxes-multi-suggestions, r=ehuss

Browse Source 
Reduce mismatched-lifetime-syntaxes suggestions to MaybeIncorrect

`cargo fix` does not have a way of distinguishing a suggestion with
multiple spans which should all be applied from multiple suggestions
where only one should be applied (see rust-lang/rust#53934). `cargo fix` only works
with `MachineApplicable` suggestions, so downgrading the applicability
will stop `cargo` from suggesting the user run `cargo
fix`. rust-analyzer does work with `MaybeIncorrect`, so interactive
fixes are still available.

r? `@ehuss`
This commit is contained in:
Jubilee
2025-06-24 19:45:35 -07:00
committed by GitHub
parent c3816350ef 46e9d2f9fc
commit ced61092ac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_lint/src/lints.rs
View File

@@ -3278,7 +3278,7 @@ impl Subdiagnostic for MismatchedLifetimeSyntaxesSuggestion {
diag.multipart_suggestion_with_style( diag.multipart_suggestion_with_style(
fluent::lint_mismatched_lifetime_syntaxes_suggestion_implicit, fluent::lint_mismatched_lifetime_syntaxes_suggestion_implicit,
suggestions, suggestions,
Applicability::MachineApplicable, Applicability::MaybeIncorrect,
style(tool_only), style(tool_only),
); );
} }
@@ -3293,7 +3293,7 @@ impl Subdiagnostic for MismatchedLifetimeSyntaxesSuggestion {
diag.multipart_suggestion_with_style( diag.multipart_suggestion_with_style(
fluent::lint_mismatched_lifetime_syntaxes_suggestion_mixed, fluent::lint_mismatched_lifetime_syntaxes_suggestion_mixed,
suggestions, suggestions,
Applicability::MachineApplicable, Applicability::MaybeIncorrect,
style(tool_only), style(tool_only),
); );
} }
@@ -3308,7 +3308,7 @@ impl Subdiagnostic for MismatchedLifetimeSyntaxesSuggestion {
diag.multipart_suggestion_with_style( diag.multipart_suggestion_with_style(
msg, msg,
suggestions, suggestions,
Applicability::MachineApplicable, Applicability::MaybeIncorrect,
style(tool_only), style(tool_only),
); );
} }