Rollup merge of #117390 - chenyukang:yukang-fix-117284-unused-macro, r=estebank
Fix unused variables lint issue for args in macro Fixes #117284 r? ````@estebank````
This commit is contained in:
commit
02d32d2bc2
5 changed files with 84 additions and 11 deletions
|
@ -778,6 +778,8 @@ passes_unused_var_maybe_capture_ref = unused variable: `{$name}`
|
|||
passes_unused_var_remove_field = unused variable: `{$name}`
|
||||
passes_unused_var_remove_field_suggestion = try removing the field
|
||||
|
||||
passes_unused_variable_args_in_macro = `{$name}` is captured in macro and introduced a unused variable
|
||||
|
||||
passes_unused_variable_try_ignore = unused variable: `{$name}`
|
||||
.suggestion = try ignoring the field
|
||||
|
||||
|
@ -785,6 +787,7 @@ passes_unused_variable_try_prefix = unused variable: `{$name}`
|
|||
.label = unused variable
|
||||
.suggestion = if this is intentional, prefix it with an underscore
|
||||
|
||||
|
||||
passes_used_compiler_linker =
|
||||
`used(compiler)` and `used(linker)` can't be used together
|
||||
|
||||
|
|
|
@ -1768,15 +1768,24 @@ pub struct UnusedVariableTryPrefix {
|
|||
#[subdiagnostic]
|
||||
pub string_interp: Vec<UnusedVariableStringInterp>,
|
||||
#[subdiagnostic]
|
||||
pub sugg: UnusedVariableTryPrefixSugg,
|
||||
pub sugg: UnusedVariableSugg,
|
||||
pub name: String,
|
||||
}
|
||||
|
||||
#[derive(Subdiagnostic)]
|
||||
#[multipart_suggestion(passes_suggestion, applicability = "machine-applicable")]
|
||||
pub struct UnusedVariableTryPrefixSugg {
|
||||
#[suggestion_part(code = "_{name}")]
|
||||
pub spans: Vec<Span>,
|
||||
pub name: String,
|
||||
pub enum UnusedVariableSugg {
|
||||
#[multipart_suggestion(passes_suggestion, applicability = "machine-applicable")]
|
||||
TryPrefixSugg {
|
||||
#[suggestion_part(code = "_{name}")]
|
||||
spans: Vec<Span>,
|
||||
name: String,
|
||||
},
|
||||
#[help(passes_unused_variable_args_in_macro)]
|
||||
NoSugg {
|
||||
#[primary_span]
|
||||
span: Span,
|
||||
name: String,
|
||||
},
|
||||
}
|
||||
|
||||
pub struct UnusedVariableStringInterp {
|
||||
|
|
|
@ -1580,7 +1580,6 @@ impl<'tcx> Liveness<'_, 'tcx> {
|
|||
opt_body: Option<&hir::Body<'_>>,
|
||||
) {
|
||||
let first_hir_id = hir_ids_and_spans[0].0;
|
||||
|
||||
if let Some(name) = self.should_warn(var).filter(|name| name != "self") {
|
||||
// annoying: for parameters in funcs like `fn(x: i32)
|
||||
// {ret}`, there is only one node, so asking about
|
||||
|
@ -1652,11 +1651,29 @@ impl<'tcx> Liveness<'_, 'tcx> {
|
|||
},
|
||||
);
|
||||
} else {
|
||||
// #117284, when `pat_span` and `ident_span` have different contexts
|
||||
// we can't provide a good suggestion, instead we pointed out the spans from macro
|
||||
let from_macro = non_shorthands
|
||||
.iter()
|
||||
.find(|(_, pat_span, ident_span)| {
|
||||
pat_span.ctxt() != ident_span.ctxt() && pat_span.from_expansion()
|
||||
})
|
||||
.map(|(_, pat_span, _)| *pat_span);
|
||||
let non_shorthands = non_shorthands
|
||||
.into_iter()
|
||||
.map(|(_, _, ident_span)| ident_span)
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let suggestions = self.string_interp_suggestions(&name, opt_body);
|
||||
let sugg = if let Some(span) = from_macro {
|
||||
errors::UnusedVariableSugg::NoSugg { span, name: name.clone() }
|
||||
} else {
|
||||
errors::UnusedVariableSugg::TryPrefixSugg {
|
||||
spans: non_shorthands,
|
||||
name: name.clone(),
|
||||
}
|
||||
};
|
||||
|
||||
self.ir.tcx.emit_spanned_lint(
|
||||
lint::builtin::UNUSED_VARIABLES,
|
||||
first_hir_id,
|
||||
|
@ -1666,10 +1683,8 @@ impl<'tcx> Liveness<'_, 'tcx> {
|
|||
.collect::<Vec<_>>(),
|
||||
errors::UnusedVariableTryPrefix {
|
||||
label: if !suggestions.is_empty() { Some(pat.span) } else { None },
|
||||
sugg: errors::UnusedVariableTryPrefixSugg {
|
||||
spans: non_shorthands,
|
||||
name,
|
||||
},
|
||||
name,
|
||||
sugg,
|
||||
string_interp: suggestions,
|
||||
},
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue