diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs index 179de61f9dd..0142a06ed83 100644 --- a/crates/hir_expand/src/builtin_macro.rs +++ b/crates/hir_expand/src/builtin_macro.rs @@ -788,9 +788,9 @@ fn test_concat_expand() { r##" #[rustc_builtin_macro] macro_rules! concat {} - concat!("foo", "r", 0, r#"bar"#, false); + concat!("foo", "r", 0, r#"bar"#, "\n", false); "##, - expect![[r#""foor0barfalse""#]], + expect![[r#""foor0bar\nfalse""#]], ); } } diff --git a/crates/hir_expand/src/quote.rs b/crates/hir_expand/src/quote.rs index c82487ef042..230a599641b 100644 --- a/crates/hir_expand/src/quote.rs +++ b/crates/hir_expand/src/quote.rs @@ -196,8 +196,8 @@ fn to_token($this) -> tt::TokenTree { tt::Literal => self { self }; tt::Ident => self { self }; tt::Punct => self { self }; - &str => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}}; - String => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}} + &str => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}}; + String => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}} } #[cfg(test)]