bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #119704 - chenyukang:yukang-fix-let_underscore, r=Nilstrieb

Browse source 
Fix two variable binding issues in lint let_underscore

Fixes #119696
Fixes #119697
This commit is contained in:
Matthias Krüger 2024-01-09 00:19:35 +01:00 • committed by GitHub
commit 5efa69d979
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 110 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_lint/src/let_underscore.rs
View file

@ -108,6 +108,10 @@ impl<'tcx> LateLintPass<'tcx> for LetUnderscore {
if !matches!(local.pat.kind, hir::PatKind::Wild) {
return;
}
if matches!(local.source, rustc_hir::LocalSource::AsyncFn) {
return;
}
if let Some(init) = local.init {
let init_ty = cx.typeck_results().expr_ty(init);
// If the type has a trivial Drop implementation, then it doesn't
@ -126,6 +130,7 @@ impl<'tcx> LateLintPass<'tcx> for LetUnderscore {
suggestion: local.pat.span,
multi_suggestion_start: local.span.until(init.span),
multi_suggestion_end: init.span.shrink_to_hi(),
is_assign_desugar: matches!(local.source, rustc_hir::LocalSource::AssignDesugar(_)),
};
if is_sync_lock {
let mut span = MultiSpan::from_spans(vec![local.pat.span, init.span]);

4
compiler/rustc_lint/src/lints.rs
View file

@ -932,6 +932,7 @@ pub struct NonBindingLetSub {
pub suggestion: Span,
pub multi_suggestion_start: Span,
pub multi_suggestion_end: Span,
pub is_assign_desugar: bool,
}
impl AddToDiagnostic for NonBindingLetSub {
@ -939,10 +940,11 @@ impl AddToDiagnostic for NonBindingLetSub {
where
F: Fn(&mut Diagnostic, SubdiagnosticMessage) -> SubdiagnosticMessage,
{
let prefix = if self.is_assign_desugar { "let " } else { "" };
diag.span_suggestion_verbose(
self.suggestion,
fluent::lint_non_binding_let_suggestion,
"_unused",
format!("{prefix}_unused"),
Applicability::MachineApplicable,
);
diag.multipart_suggestion(