Clean up a handful of build warnings.

7 files changed, 13 insertions, 13 deletions

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 96a0461de1e..e1f31b83524 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -394,7 +394,7 @@ pub fn new_name_finder() -> @Visitor<@mut ~[ast::ident]> {
 }
 
 pub fn expand_block(extsbox: @mut SyntaxEnv,
-                    cx: @ExtCtxt,
+                    _cx: @ExtCtxt,
                     blk: &blk_,
                     sp: span,
                     fld: @ast_fold,
diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs
index 67d3f84d1ff..6d0c499f2c8 100644
--- a/src/libsyntax/ext/fmt.rs
+++ b/src/libsyntax/ext/fmt.rs
@@ -53,7 +53,7 @@ pub fn expand_syntax_ext(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree])
 fn pieces_to_expr(cx: @ExtCtxt, sp: span,
                   pieces: ~[Piece], args: ~[@ast::expr])
    -> @ast::expr {
-    fn make_path_vec(cx: @ExtCtxt, ident: &str) -> ~[ast::ident] {
+    fn make_path_vec(ident: &str) -> ~[ast::ident] {
         return ~[str_to_ident("std"),
                  str_to_ident("unstable"),
                  str_to_ident("extfmt"),
@@ -61,7 +61,7 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span,
                  str_to_ident(ident)];
     }
     fn make_rt_path_expr(cx: @ExtCtxt, sp: span, nm: &str) -> @ast::expr {
-        let path = make_path_vec(cx, nm);
+        let path = make_path_vec(nm);
         cx.expr_path(cx.path_global(sp, path))
     }
     // Produces an AST expression that represents a RT::conv record,
@@ -90,7 +90,7 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span,
               }
               CountIs(c) => {
                 let count_lit = cx.expr_uint(sp, c as uint);
-                let count_is_path = make_path_vec(cx, "CountIs");
+                let count_is_path = make_path_vec("CountIs");
                 let count_is_args = ~[count_lit];
                 return cx.expr_call_global(sp, count_is_path, count_is_args);
               }
@@ -114,7 +114,7 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span,
                          ty_expr: @ast::expr) -> @ast::expr {
             cx.expr_struct(
                 sp,
-                cx.path_global(sp, make_path_vec(cx, "Conv")),
+                cx.path_global(sp, make_path_vec("Conv")),
                 ~[
                     cx.field_imm(sp, str_to_ident("flags"), flags_expr),
                     cx.field_imm(sp, str_to_ident("width"), width_expr),
@@ -133,7 +133,7 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span,
     fn make_conv_call(cx: @ExtCtxt, sp: span, conv_type: &str, cnv: &Conv,
                       arg: @ast::expr, buf: @ast::expr) -> @ast::expr {
         let fname = ~"conv_" + conv_type;
-        let path = make_path_vec(cx, fname);
+        let path = make_path_vec(fname);
         let cnv_expr = make_rt_conv_expr(cx, sp, cnv);
         let args = ~[cnv_expr, arg, buf];
         cx.expr_call_global(arg.span, path, args)
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index 062532afef8..09c9dd922c7 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -92,7 +92,7 @@ pub mod rt {
 
     impl<'self> ToSource for &'self [@ast::item] {
         fn to_source(&self) -> ~str {
-            str::connect(self.map(|i| i.to_source()), ~"\n\n")
+            str::connect(self.map(|i| i.to_source()), "\n\n")
         }
     }
 
@@ -104,7 +104,7 @@ pub mod rt {
 
     impl<'self> ToSource for &'self [@ast::Ty] {
         fn to_source(&self) -> ~str {
-            str::connect(self.map(|i| i.to_source()), ~", ")
+            str::connect(self.map(|i| i.to_source()), ", ")
         }
     }
 
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index fcdfb0a6ba7..4d1e9a31821 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -12,7 +12,7 @@ use core::prelude::*;
 
 use ast;
 use codemap;
-use codemap::{FileMap, Loc, Pos, ExpandedFrom, span};
+use codemap::{Pos, ExpandedFrom, span};
 use codemap::{CallInfo, NameAndSpan};
 use ext::base::*;
 use ext::base;
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index f0b078603db..f8a783c568a 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -132,7 +132,7 @@ enum lis {
 }
 
 fn lockstep_iter_size(t: &token_tree, r: &mut TtReader) -> lis {
-    fn lis_merge(lhs: lis, rhs: lis, r: &mut TtReader) -> lis {
+    fn lis_merge(lhs: lis, rhs: lis) -> lis {
         match lhs {
           lis_unconstrained => copy rhs,
           lis_contradiction(_) => copy lhs,
@@ -154,7 +154,7 @@ fn lockstep_iter_size(t: &token_tree, r: &mut TtReader) -> lis {
       tt_delim(ref tts) | tt_seq(_, ref tts, _, _) => {
         vec::foldl(lis_unconstrained, *tts, |lis, tt| {
             let lis2 = lockstep_iter_size(tt, r);
-            lis_merge(lis, lis2, r)
+            lis_merge(lis, lis2)
         })
       }
       tt_tok(*) => lis_unconstrained,
diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
index 9fb69821953..6027d3b07f2 100644
--- a/src/libsyntax/parse/common.rs
+++ b/src/libsyntax/parse/common.rs
@@ -49,7 +49,7 @@ pub fn seq_sep_none() -> SeqSep {
 
 // maps any token back to a string. not necessary if you know it's
 // an identifier....
-pub fn token_to_str(reader: @reader, token: &token::Token) -> ~str {
+pub fn token_to_str(token: &token::Token) -> ~str {
     token::to_str(get_ident_interner(), token)
 }
 
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index a6b67ccea9d..300e5adcf92 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2573,7 +2573,7 @@ impl Parser {
     fn parse_let(&self) -> @decl {
         let is_mutbl = self.eat_keyword(keywords::Mut);
         let lo = self.span.lo;
-        let mut local = self.parse_local(is_mutbl);
+        let local = self.parse_local(is_mutbl);
         while self.eat(&token::COMMA) {
             let _ = self.parse_local(is_mutbl);
             self.obsolete(*self.span, ObsoleteMultipleLocalDecl);