Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

format_args: handle key-value arguments

Browse source
This commit is contained in:
Jonas Schievink 2020-12-10 13:46:47 +01:00
parent 06a03bab8e
commit 948832d10b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/hir_expand/src/builtin_macro.rs
View file

@ -245,6 +245,12 @@ fn format_args_expand(
if args.is_empty() { if args.is_empty() {
return ExpandResult::only_err(mbe::ExpandError::NoMatchingRule); return ExpandResult::only_err(mbe::ExpandError::NoMatchingRule);
} }
for arg in &mut args {
// Remove `key =`.
if matches!(arg.get(1), Some(tt::TokenTree::Leaf(tt::Leaf::Punct(p))) if p.char == '=') {
arg.drain(..2);
}
}
let _format_string = args.remove(0); let _format_string = args.remove(0);
let arg_tts = args.into_iter().flat_map(|arg| { let arg_tts = args.into_iter().flat_map(|arg| {
quote! { std::fmt::ArgumentV1::new(&(##arg), std::fmt::Display::fmt), } quote! { std::fmt::ArgumentV1::new(&(##arg), std::fmt::Display::fmt), }