Skip to content

Commit

Permalink
Auto merge of #11473 - Alexendoo:format-args-span-parents, r=dswij
Browse files Browse the repository at this point in the history
Ignore span's parents in `collect_ast_format_args`/`find_format_args`

Fixes #11470, covers some cases missed by #10980

Can't have a test yet because of #11126 but it works locally

changelog: none

r? `@dswij`
  • Loading branch information
bors committed Sep 12, 2023
2 parents cb05701 + cc8c0e0 commit b788add
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions clippy_utils/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,9 @@ thread_local! {
/// `FormatArgsCollector`
pub fn collect_ast_format_args(span: Span, format_args: &FormatArgs) {
AST_FORMAT_ARGS.with(|ast_format_args| {
ast_format_args.borrow_mut().insert(span, format_args.clone());
ast_format_args
.borrow_mut()
.insert(span.with_parent(None), format_args.clone());
});
}

Expand All @@ -414,7 +416,7 @@ pub fn find_format_args(cx: &LateContext<'_>, start: &Expr<'_>, expn_id: ExpnId,

if let Some(expr) = format_args_expr {
AST_FORMAT_ARGS.with(|ast_format_args| {
ast_format_args.borrow().get(&expr.span).map(callback);
ast_format_args.borrow().get(&expr.span.with_parent(None)).map(callback);
});
}
}
Expand Down

0 comments on commit b788add

Please sign in to comment.