auto merge of #12109 : omasanori/rust/small-fixes, r=sfackler

Most of them are to reduce warnings in testing builds.

Author: bors

src/doc/index.md

@@ -51,7 +51,6 @@ li {list-style-type: none; }
 # Tooling
 
 * [The `rustdoc` manual](rustdoc.html)
-* [The `rustpkg` manual](rustpkg.html)
 
 # FAQs
 

src/librustc/driver/driver.rs

@@ -1181,7 +1181,6 @@ mod test {
     use getopts::getopts;
     use syntax::attr;
     use syntax::attr::AttrMetaMethods;
-    use syntax::diagnostic;
 
     // When the user supplies --test we should implicitly supply --cfg test
     #[test]

src/libsemver/lib.rs

@@ -152,19 +152,6 @@ impl cmp::Ord for Version {
                  (_, _) => self.pre < other.pre
              }))
     }
-
-    #[inline]
-    fn le(&self, other: &Version) -> bool {
-        ! (other < self)
-    }
-    #[inline]
-    fn gt(&self, other: &Version) -> bool {
-        other < self
-    }
-    #[inline]
-    fn ge(&self, other: &Version) -> bool {
-        ! (self < other)
-    }
 }
 
 fn take_nonempty_prefix<T:Iterator<char>>(rdr: &mut T, pred: |char| -> bool)

src/libstd/c_str.rs

@@ -524,7 +524,6 @@ mod tests {
     #[test]
     fn test_to_c_str_fail() {
         use task;
-        let mut error_happened = false;
         assert!(task::try(proc() { "he\x00llo".to_c_str() }).is_err());
     }
 

src/libstd/unit.rs

@@ -12,6 +12,7 @@
 
 #[cfg(not(test))]
 use default::Default;
+#[cfg(not(test))]
 use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd};
 
 #[cfg(not(test))]

src/libsyntax/ext/expand.rs

@@ -890,17 +890,15 @@ fn original_span(cx: &ExtCtxt) -> @codemap::ExpnInfo {
 mod test {
     use super::*;
     use ast;
-    use ast::{Attribute_, AttrOuter, MetaWord, EMPTY_CTXT};
-    use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve, new_rename};
+    use ast::{Attribute_, AttrOuter, MetaWord};
+    use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve};
     use ast_util;
     use codemap;
     use codemap::Spanned;
-    use fold::*;
     use ext::base::{CrateLoader, MacroCrate};
     use parse;
-    use parse::token::{fresh_mark, gensym, intern};
     use parse::token;
-    use util::parser_testing::{string_to_crate, string_to_crate_and_sess};
+    use util::parser_testing::{string_to_crate_and_sess};
     use util::parser_testing::{string_to_pat, strs_to_idents};
     use visit;
     use visit::Visitor;
@@ -1227,7 +1225,7 @@ foo_module!()
                 "xx" == string.get()
             }
         }).enumerate() {
-            if (mtwt_resolve(v.segments[0].identifier) != resolved_binding) {
+            if mtwt_resolve(v.segments[0].identifier) != resolved_binding {
                 println!("uh oh, xx binding didn't match xx varref:");
                 println!("this is xx varref \\# {:?}",idx);
                 println!("binding: {:?}",cxbind);