Merge #7422

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



Co-authored-by: Laurențiu Nicola <[email protected]>

1 files changed, 4 insertions, 2 deletions

diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 2806842cd..57bc6fbd7 100644
--- a/crates/hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
@@ -331,7 +331,9 @@ fn concat_expand(
                 text.push_str(&component);
             }
             // 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());
             }
             tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 1 && punct.char == ',' => (),
@@ -739,7 +741,7 @@ mod tests {
             r##"
             #[rustc_builtin_macro]
             macro_rules! concat {}
-            concat!("foo", r, 0, r#"bar"#, false);
+            concat!("foo", "r", 0, r#"bar"#, false);
             "##,
         );