From dd071eeeb8acc4ef616a18c468e889d2aa7782c2 Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sat, 8 Feb 2014 14:32:37 +0900 Subject: [PATCH 1/5] Remove redundant Ord implementation for Version. I've forgot why we keep them, so let me know if you know their reason for existing. Signed-off-by: OGINO Masanori --- src/libsemver/lib.rs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 9c5dd656d427d..036d5ae22be2a 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -151,19 +151,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>(rdr: &mut T, pred: |char| -> bool) From f7eb7052484fa56d789778ea66039b17add4e033 Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sat, 8 Feb 2014 14:37:34 +0900 Subject: [PATCH 2/5] Fix unused import warnings. Signed-off-by: OGINO Masanori --- src/librustc/driver/driver.rs | 1 - src/libstd/unit.rs | 1 + src/libsyntax/ext/expand.rs | 8 +++----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 3e5ecc605d612..0d45d5bdbab43 100644 --- a/src/librustc/driver/driver.rs +++ b/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] diff --git a/src/libstd/unit.rs b/src/libstd/unit.rs index 675d6f35aab2e..3aa3e020500ea 100644 --- a/src/libstd/unit.rs +++ b/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))] diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 5dc16b9b6b6a1..0d98a632c6c92 100644 --- a/src/libsyntax/ext/expand.rs +++ b/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; From d4898e72e3114efb5076f0fdf28649578f7d9c9f Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sat, 8 Feb 2014 14:38:14 +0900 Subject: [PATCH 3/5] Remove an unused variable in a test of std::c_str. Signed-off-by: OGINO Masanori --- src/libstd/c_str.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 6fc31b673acf6..fdef7e36bd5bd 100644 --- a/src/libstd/c_str.rs +++ b/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()); } From e107121e3443c9e91a00c0d6c7136c56e508f747 Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sat, 8 Feb 2014 14:43:55 +0900 Subject: [PATCH 4/5] Remove unnecessary parentheses. Signed-off-by: OGINO Masanori --- src/libsyntax/ext/expand.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 0d98a632c6c92..cfad88e24820a 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1225,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); From f87e5078580b84aaaae8dca766533745d95c796e Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sun, 9 Feb 2014 00:46:31 +0900 Subject: [PATCH 5/5] rustpkg has gone. Signed-off-by: OGINO Masanori --- src/doc/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/doc/index.md b/src/doc/index.md index a552a48714beb..5bf27128fbc1f 100644 --- a/src/doc/index.md +++ b/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