Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11473 - Alexendoo:format-args-span-parents, r=dswij

Browse source 
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`
This commit is contained in:
bors 2023-09-12 16:43:14 +00:00
commit b788addfcc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clippy_utils/src/macros.rs
View file

@ -389,7 +389,9 @@ thread_local! {
/// `FormatArgsCollector` /// `FormatArgsCollector`
pub fn collect_ast_format_args(span: Span, format_args: &FormatArgs) { pub fn collect_ast_format_args(span: Span, format_args: &FormatArgs) {
AST_FORMAT_ARGS.with(|ast_format_args| { 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());
}); });
} }
@ -414,7 +416,7 @@ pub fn find_format_args(cx: &LateContext<'_>, start: &Expr<'_>, expn_id: ExpnId,
if let Some(expr) = format_args_expr { if let Some(expr) = format_args_expr {
AST_FORMAT_ARGS.with(|ast_format_args| { 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);
}); });
} }
} }