diff options
| author | bors <bors@rust-lang.org> | 2014-02-08 10:31:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-08 10:31:33 -0800 |
| commit | 35518514c472e0b7bb4dd3588c4c80bd6dd5a627 (patch) | |
| tree | 93b29d0ee24f69ac1ca0aca99635549da488b111 /src/libstd | |
| parent | 5acc998ed9b76d9c00849e007101f9c33b17c6c4 (diff) | |
| parent | f87e5078580b84aaaae8dca766533745d95c796e (diff) | |
| download | rust-35518514c472e0b7bb4dd3588c4c80bd6dd5a627.tar.gz rust-35518514c472e0b7bb4dd3588c4c80bd6dd5a627.zip | |
auto merge of #12109 : omasanori/rust/small-fixes, r=sfackler
Most of them are to reduce warnings in testing builds.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/c_str.rs | 1 | ||||
| -rw-r--r-- | src/libstd/unit.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 6fc31b673ac..fdef7e36bd5 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()); } diff --git a/src/libstd/unit.rs b/src/libstd/unit.rs index 675d6f35aab..3aa3e020500 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))] |