cleanup warnings from librustc

diff --git a/src/librustc/back/rpath.rs b/src/librustc/back/rpath.rs
index 026b2944a624f3d85cea8aaf290490645822533a..24be917aedc9f101cb617add441859aa5dd133d6 100644 (file)
--- a/src/librustc/back/rpath.rs
+++ b/src/librustc/back/rpath.rs
@@ -211,8 +211,8 @@ mod test {
 
     #[test]
     fn test_rpaths_to_flags() {
-        let flags = rpaths_to_flags(~[Path("path1"),
-                                      Path("path2")]);
+        let flags = rpaths_to_flags([Path("path1"),
+                                     Path("path2")]);
         assert_eq!(flags, ~[~"-Wl,-rpath,path1", ~"-Wl,-rpath,path2"]);
     }
 
@@ -243,10 +243,10 @@ fn test_minimize1() {
 
     #[test]
     fn test_minimize2() {
-        let res = minimize_rpaths(~[Path("1a"), Path("2"), Path("2"),
-                                    Path("1a"), Path("4a"),Path("1a"),
-                                    Path("2"), Path("3"), Path("4a"),
-                                    Path("3")]);
+        let res = minimize_rpaths([Path("1a"), Path("2"), Path("2"),
+                                   Path("1a"), Path("4a"),Path("1a"),
+                                   Path("2"), Path("3"), Path("4a"),
+                                   Path("3")]);
         assert_eq!(res, ~[Path("1a"), Path("2"), Path("4a"), Path("3")]);
     }
 

diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 4298cb5b15b31fd9268fa6b175386e4433a586b1..a7cc90f473d4bd2b5955d4b45f72e72ad125ba43 100644 (file)
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -30,7 +30,7 @@
 use core::os;
 use core::str;
 use core::vec;
-use extra::getopts::groups::{optopt, optmulti, optflag, optflagopt, getopts};
+use extra::getopts::groups::{optopt, optmulti, optflag, optflagopt};
 use extra::getopts::{opt_present};
 use extra::getopts;
 use syntax::ast;
@@ -942,7 +942,7 @@ fn test_switch_implies_cfg_test() {
             @~"rustc", matches, diagnostic::emit);
         let sess = build_session(sessopts, diagnostic::emit);
         let cfg = build_configuration(sess, @~"whatever", &str_input(~""));
-        assert!((attr::contains_name(cfg, ~"test")));
+        assert!((attr::contains_name(cfg, "test")));
     }
 
     // When the user supplies --test and --cfg test, don't implicitly add
@@ -950,7 +950,7 @@ fn test_switch_implies_cfg_test() {
     #[test]
     fn test_switch_implies_cfg_test_unless_cfg_test() {
         let matches =
-            &match getopts(~[~"--test", ~"--cfg=test"], optgroups()) {
+            &match getopts([~"--test", ~"--cfg=test"], optgroups()) {
               Ok(copy m) => m,
               Err(copy f) => {
                 fail!("test_switch_implies_cfg_test_unless_cfg_test: %s", getopts::fail_str(f));
@@ -960,7 +960,7 @@ fn test_switch_implies_cfg_test_unless_cfg_test() {
             @~"rustc", matches, diagnostic::emit);
         let sess = build_session(sessopts, diagnostic::emit);
         let cfg = build_configuration(sess, @~"whatever", &str_input(~""));
-        let test_items = attr::find_meta_items_by_name(cfg, ~"test");
+        let test_items = attr::find_meta_items_by_name(cfg, "test");
         assert_eq!(test_items.len(), 1u);
     }
 }

diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
index 2b2f2df577b2e06d8b05492158bce199fc712885..d156457ca8865dcf249a8a5a2436390f717bf861 100644 (file)
--- a/src/librustc/middle/lint.rs
+++ b/src/librustc/middle/lint.rs
@@ -10,7 +10,6 @@
 
 use core::prelude::*;
 
-use driver::session::Session;
 use driver::session;
 use middle::ty;
 use middle::pat_util;

diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index 6a6746ab20bd9b4a6c5205aed21d766d1060a75a..cda0dfd12a35efecd3fe5be42b882430d8929019 100644 (file)
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -535,7 +535,7 @@ fn set_module_kind(@mut self,
                        parent_link: ParentLink,
                        def_id: Option<def_id>,
                        kind: ModuleKind,
-                       sp: span) {
+                       _sp: span) {
         match self.type_def {
             None => {
                 let module = @mut Module(parent_link, def_id, kind);
@@ -2586,8 +2586,8 @@ fn resolve_module_path_from_root(@mut self,
                                         (ImportSearch, ImplModuleKind) => {
                                             self.session.span_err(
                                                 span,
-                                                ~"cannot import from a trait \
-                                                  or type implementation");
+                                                "cannot import from a trait \
+                                                 or type implementation");
                                             return Failed;
                                         }
                                         (_, _) => search_module = module_def,

diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs
index baa0dfc79e9fcd5950498cb5cb84e20af92a7537..381c257f6511cdd16150799432baabddd8710fcb 100644 (file)
--- a/src/librustc/middle/trans/meth.rs
+++ b/src/librustc/middle/trans/meth.rs
@@ -873,7 +873,7 @@ pub fn trans_trait_cast(bcx: block,
                         val: @ast::expr,
                         id: ast::node_id,
                         dest: expr::Dest,
-                        store: ty::TraitStore)
+                        _store: ty::TraitStore)
                      -> block {
     let mut bcx = bcx;
     let _icx = bcx.insn_ctxt("impl::trans_cast");

diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs
index 0e82de86bc6dd61c658a0f4d2535f510f470adff..4d9d9f53e4c16147cc45139d3ef8e75a925f7fa3 100644 (file)
--- a/src/librustc/middle/trans/reflect.rs
+++ b/src/librustc/middle/trans/reflect.rs
@@ -145,7 +145,7 @@ fn vstore_name_and_extra(&mut self,
     }
 
     fn leaf(&mut self, name: ~str) {
-        self.visit(name, ~[]);
+        self.visit(name, []);
     }
 
     // Entrypoint

diff --git a/src/librustc/util/enum_set.rs b/src/librustc/util/enum_set.rs
index d31d943db0701ab7c6bafc9af11d3df9871a14c8..6534a7ba9b0885977052590b527a409936f6a60a 100644 (file)
--- a/src/librustc/util/enum_set.rs
+++ b/src/librustc/util/enum_set.rs
@@ -10,8 +10,6 @@
 
 use core::prelude::*;
 
-use core;
-
 #[deriving(Eq, IterBytes)]
 pub struct EnumSet<E> {
     // We must maintain the invariant that no bits are set