about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-28 01:25:38 +0000
committerbors <bors@rust-lang.org>2017-12-28 01:25:38 +0000
commit6c06bfaebad19abc73506e730e97b03291ecf187 (patch)
tree012c4967a1bb2e0739f411dd0c1df638aafee087 /src/libsyntax
parente687205fd05a1390f45e21bbe21b5cdf0bab5af8 (diff)
parentd1aa29ba3282662518e3b30e6db6f7af2b906356 (diff)
downloadrust-6c06bfaebad19abc73506e730e97b03291ecf187.tar.gz
rust-6c06bfaebad19abc73506e730e97b03291ecf187.zip
Auto merge of #47017 - topecongiro:issue-33469, r=estebank
Do not panic on interpolated token inside quote macro

Closes #33469.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/quote.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index 426dde4f2a7..6141c38ab14 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -669,7 +669,11 @@ fn expr_mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> P<ast::Expr> {
                                 vec![mk_name(cx, sp, ast::Ident::with_empty_ctxt(ident))]);
         }
 
-        token::Interpolated(_) => panic!("quote! with interpolated token"),
+        token::Interpolated(_) => {
+            cx.span_err(sp, "quote! with interpolated token");
+            // Use dummy name.
+            "Interpolated"
+        }
 
         token::Eq           => "Eq",
         token::Lt           => "Lt",