aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_expand/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-05-09 13:01:35 +0100
committerGitHub <[email protected]>2021-05-09 13:01:35 +0100
commitb43921cdddb4e703787ab87b0ea3f8eaff94f6c9 (patch)
treec562d58f6f25d8816643c5dbfd24a2cbae087e9c /crates/hir_expand/src
parent6c0cdc5f550c0ccef762fcff7d1fbee9b6245027 (diff)
parent01ce37c8052136b3a5ab1f703f774a1b293a25b7 (diff)
Merge #8777
8777: Escape characters in builtin macros correctly r=edwin0cheng a=edwin0cheng Fixes #8749 It is the same bug in #8560 but in our `quote!` macro. Because the "\" are adding exponentially in #8749 case, so the text is eat up all the memory. bors r+ Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/hir_expand/src')
-rw-r--r--crates/hir_expand/src/builtin_macro.rs4
-rw-r--r--crates/hir_expand/src/quote.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 179de61f9..0142a06ed 100644
--- a/crates/hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
@@ -788,9 +788,9 @@ mod tests {
788 r##" 788 r##"
789 #[rustc_builtin_macro] 789 #[rustc_builtin_macro]
790 macro_rules! concat {} 790 macro_rules! concat {}
791 concat!("foo", "r", 0, r#"bar"#, false); 791 concat!("foo", "r", 0, r#"bar"#, "\n", false);
792 "##, 792 "##,
793 expect![[r#""foor0barfalse""#]], 793 expect![[r#""foor0bar\nfalse""#]],
794 ); 794 );
795 } 795 }
796} 796}
diff --git a/crates/hir_expand/src/quote.rs b/crates/hir_expand/src/quote.rs
index c82487ef0..230a59964 100644
--- a/crates/hir_expand/src/quote.rs
+++ b/crates/hir_expand/src/quote.rs
@@ -196,8 +196,8 @@ impl_to_to_tokentrees! {
196 tt::Literal => self { self }; 196 tt::Literal => self { self };
197 tt::Ident => self { self }; 197 tt::Ident => self { self };
198 tt::Punct => self { self }; 198 tt::Punct => self { self };
199 &str => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}}; 199 &str => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}};
200 String => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}} 200 String => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}}
201} 201}
202 202
203#[cfg(test)] 203#[cfg(test)]