language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #7422

Browse source 
7422: Disallow non-boolean literals in concat! r=lnicola a=lnicola



Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-01-25 11:35:37 +00:00 • committed by GitHub
commit a6a5b02f4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -331,7 +331,9 @@ fn concat_expand(
text.push_str(&component); text.push_str(&component);
} }
// handle boolean literals // handle boolean literals
tt::TokenTree::Leaf(tt::Leaf::Ident(id)) if i % 2 == 0 => { tt::TokenTree::Leaf(tt::Leaf::Ident(id))
if i % 2 == 0 && (id.text == "true" || id.text == "false") =>
{
text.push_str(id.text.as_str()); text.push_str(id.text.as_str());
} }
tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 1 && punct.char == ',' => (), tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 1 && punct.char == ',' => (),
@ -739,7 +741,7 @@ mod tests {
r##" r##"
#[rustc_builtin_macro] #[rustc_builtin_macro]
macro_rules! concat {} macro_rules! concat {}
concat!("foo", r, 0, r#"bar"#, false); concat!("foo", "r", 0, r#"bar"#, false);
"##, "##,
); );