about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-20 04:11:32 -0800
committerbors <bors@rust-lang.org>2014-01-20 04:11:32 -0800
commit068d8288509d5869af24a179209d3927f68e441d (patch)
treed03be9c09bc387fa75f4a4a61dd1270f62d7e05f /src/libsyntax
parente83e5769ee01ab7b8ede809618131517aaafe72c (diff)
parentdac3c53ee1e5dfaea674a9345b8d357c0e4d0f37 (diff)
auto merge of #11660 : sfackler/rust/quote-unused-sp, r=huonw
The provided span isn't used in all cases (namely primitives).
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/quote.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index 8b5e6872839..f840bde6dc1 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -530,7 +530,7 @@ fn mk_tt(cx: &ExtCtxt, sp: Span, tt: &ast::TokenTree) -> ~[@ast::Stmt] {
     match *tt {
 
         ast::TTTok(sp, ref tok) => {
-            let e_sp = cx.expr_ident(sp, id_ext("sp"));
+            let e_sp = cx.expr_ident(sp, id_ext("_sp"));
             let e_tok = cx.expr_call_ident(sp,
                                            id_ext("TTTok"),
                                            ~[e_sp, mk_token(cx, sp, tok)]);
@@ -628,7 +628,7 @@ fn expand_tts(cx: &ExtCtxt, sp: Span, tts: &[ast::TokenTree])
                                    ~[]);
 
     let stmt_let_sp = cx.stmt_let(sp, false,
-                                  id_ext("sp"),
+                                  id_ext("_sp"),
                                   e_sp);
 
     let stmt_let_tt = cx.stmt_let(sp, true,