From c999b253b7587cd647b06582f10d55cbaf65e635 Mon Sep 17 00:00:00 2001
From: csmoe <35686186+csmoe@users.noreply.github.com>
Date: Wed, 4 Jul 2018 09:01:11 +0800
Subject: [PATCH] add span note

---
 src/libsyntax_ext/concat.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libsyntax_ext/concat.rs b/src/libsyntax_ext/concat.rs
index 9ebd2e4be71c..1f79c1db9950 100644
--- a/src/libsyntax_ext/concat.rs
+++ b/src/libsyntax_ext/concat.rs
@@ -55,10 +55,17 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt,
             }
             _ => {
                 let mut err = cx.struct_span_err(e.span, "expected a literal");
+                let msg = cx.codemap().span_to_snippet(e.span).unwrap_or_else(
+                    |_| pprust::expr_to_string(&e)
+                );
                 err.span_suggestion(
                     e.span,
                     "consider changing this to",
-                    format!("\"{{}}\", {}", pprust::expr_to_string(&e))
+                    format!("\"{{}}\", {}", msg)
+                );
+                err.span_note(
+                    e.span,
+                    "you might be missing a string literal to format with",
                 );
                 err.emit();
             }