auto merge of #5653 : brson/rust/warnings, r=brson

7 files changed, 5 insertions, 8 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 16399674b55..2e7ae4c537a 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -10,7 +10,7 @@
 
 // The Rust abstract syntax tree.
 
-use codemap::{span, FileName, spanned};
+use codemap::{span, spanned};
 use abi::AbiSet;
 use opt_vec::OptVec;
 
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index ff5cbbe9f23..f22b466efeb 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -15,7 +15,6 @@ use ast::*;
 use ast;
 use ast_util::{inlined_item_utils, stmt_id};
 use ast_util;
-use attr;
 use codemap;
 use codemap::spanned;
 use diagnostic::span_handler;
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 72355d04456..9f8dbef9b96 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -19,7 +19,6 @@ use codemap::BytePos;
 use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
-use core::either::Either;
 use core::vec;
 use core::hashmap::linear::LinearSet;
 use std;
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs
index e2c52fad110..18ebceaeb43 100644
--- a/src/libsyntax/ext/deriving/mod.rs
+++ b/src/libsyntax/ext/deriving/mod.rs
@@ -286,7 +286,7 @@ pub fn create_enum_variant_pattern(cx: @ext_ctxt,
     }
 }
 
-pub fn variant_arg_count(cx: @ext_ctxt, span: span, variant: &variant) -> uint {
+pub fn variant_arg_count(_cx: @ext_ctxt, _span: span, variant: &variant) -> uint {
     match variant.node.kind {
         tuple_variant_kind(ref args) => args.len(),
         struct_variant_kind(ref struct_def) => struct_def.fields.len(),
diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index 72e6c22dbc8..1d1a101d61f 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -16,7 +16,7 @@
 use core::prelude::*;
 
 use abi::AbiSet;
-use ast::{ident, node_id};
+use ast::ident;
 use ast;
 use ast_util;
 use codemap::{span, respan, dummy_sp, spanned};
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 353e3014cf7..ceafecde3a0 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3777,7 +3777,7 @@ pub impl Parser {
         };
     }
 
-    fn parse_enum_def(&self, generics: &ast::Generics) -> enum_def {
+    fn parse_enum_def(&self, _generics: &ast::Generics) -> enum_def {
         let mut variants = ~[];
         let mut all_nullary = true, have_disr = false;
         while *self.token != token::RBRACE {
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 0ec7bdba3d1..0c79cbca039 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -11,7 +11,6 @@
 use core::prelude::*;
 
 use abi::AbiSet;
-use abi;
 use ast::{RegionTyParamBound, TraitTyParamBound, required, provided};
 use ast;
 use ast_util;
@@ -2180,7 +2179,7 @@ pub fn print_opt_sigil(s: @ps, opt_sigil: Option<ast::Sigil>) {
 }
 
 pub fn print_fn_header_info(s: @ps,
-                            opt_sty: Option<ast::self_ty_>,
+                            _opt_sty: Option<ast::self_ty_>,
                             opt_purity: Option<ast::purity>,
                             abis: AbiSet,
                             onceness: ast::Onceness,