From 97aa34046ffec7be1e3e4f383f205344ed67da6d Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 19 Feb 2015 12:57:25 -0500 Subject: [PATCH] try to reduce bajillion warnings --- src/liballoc/lib.rs | 1 + src/libcoretest/fmt/num.rs | 28 ++++++++++++++-------------- src/libcoretest/iter.rs | 16 ++++++++-------- src/libcoretest/lib.rs | 9 +++++++++ src/librand/lib.rs | 2 ++ src/librbml/lib.rs | 2 ++ src/libstd/collections/hash/map.rs | 2 +- src/libstd/fs.rs | 6 ++++-- src/libstd/io/buffered.rs | 7 +++---- src/libstd/io/mod.rs | 8 ++++---- src/libstd/lib.rs | 3 +-- src/libstd/net/tcp.rs | 6 ------ src/libstd/net/test.rs | 2 +- src/libstd/old_io/mod.rs | 2 ++ src/libstd/old_path/mod.rs | 2 ++ src/libstd/path.rs | 1 - src/libstd/process.rs | 8 ++------ src/libstd/thread.rs | 4 ++-- 18 files changed, 58 insertions(+), 51 deletions(-) diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index bc349ebebdeed..0cdc71b6f604f 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -73,6 +73,7 @@ #![feature(unboxed_closures)] #![feature(unsafe_no_drop_flag)] #![feature(core)] +#![cfg_attr(test, feature(test, alloc, rustc_private))] #![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")), feature(libc))] diff --git a/src/libcoretest/fmt/num.rs b/src/libcoretest/fmt/num.rs index bc8461b0b9e09..bc3995439a017 100644 --- a/src/libcoretest/fmt/num.rs +++ b/src/libcoretest/fmt/num.rs @@ -170,42 +170,42 @@ mod u32 { use test::Bencher; use core::fmt::radix; use std::rand::{weak_rng, Rng}; - use std::old_io::util::NullWriter; + use std::io::{Write, sink}; #[bench] fn format_bin(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:b}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::()) }) } #[bench] fn format_oct(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:o}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::()) }) } #[bench] fn format_dec(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{}", rng.gen::()) }) } #[bench] fn format_hex(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:x}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::()) }) } #[bench] fn format_show(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:?}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::()) }) } #[bench] fn format_base_36(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{}", radix(rng.gen::(), 36)) }) + b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::(), 36)) }) } } @@ -213,41 +213,41 @@ mod i32 { use test::Bencher; use core::fmt::radix; use std::rand::{weak_rng, Rng}; - use std::old_io::util::NullWriter; + use std::io::{Write, sink}; #[bench] fn format_bin(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:b}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::()) }) } #[bench] fn format_oct(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:o}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::()) }) } #[bench] fn format_dec(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{}", rng.gen::()) }) } #[bench] fn format_hex(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:x}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::()) }) } #[bench] fn format_show(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{:?}", rng.gen::()) }) + b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::()) }) } #[bench] fn format_base_36(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { write!(&mut NullWriter, "{}", radix(rng.gen::(), 36)) }) + b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::(), 36)) }) } } diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index 39a590c730743..6cbc7bf1bbc51 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -82,7 +82,7 @@ fn test_iterator_chain() { let xs = [0, 1, 2, 3, 4, 5]; let ys = [30, 40, 50, 60]; let expected = [0, 1, 2, 3, 4, 5, 30, 40, 50, 60]; - let mut it = xs.iter().chain(ys.iter()); + let it = xs.iter().chain(ys.iter()); let mut i = 0; for &x in it { assert_eq!(x, expected[i]); @@ -91,7 +91,7 @@ fn test_iterator_chain() { assert_eq!(i, expected.len()); let ys = count(30, 10).take(4); - let mut it = xs.iter().cloned().chain(ys); + let it = xs.iter().cloned().chain(ys); let mut i = 0; for x in it { assert_eq!(x, expected[i]); @@ -110,7 +110,7 @@ fn test_filter_map() { #[test] fn test_iterator_enumerate() { let xs = [0, 1, 2, 3, 4, 5]; - let mut it = xs.iter().enumerate(); + let it = xs.iter().enumerate(); for (i, &x) in it { assert_eq!(i, x); } @@ -152,7 +152,7 @@ fn test_iterator_peekable() { fn test_iterator_take_while() { let xs = [0, 1, 2, 3, 5, 13, 15, 16, 17, 19]; let ys = [0, 1, 2, 3, 5, 13]; - let mut it = xs.iter().take_while(|&x| *x < 15); + let it = xs.iter().take_while(|&x| *x < 15); let mut i = 0; for x in it { assert_eq!(*x, ys[i]); @@ -165,7 +165,7 @@ fn test_iterator_take_while() { fn test_iterator_skip_while() { let xs = [0, 1, 2, 3, 5, 13, 15, 16, 17, 19]; let ys = [15, 16, 17, 19]; - let mut it = xs.iter().skip_while(|&x| *x < 15); + let it = xs.iter().skip_while(|&x| *x < 15); let mut i = 0; for x in it { assert_eq!(*x, ys[i]); @@ -231,7 +231,7 @@ fn test_iterator_scan() { let xs = [0, 1, 2, 3, 4]; let ys = [0f64, 1.0, 3.0, 6.0, 10.0]; - let mut it = xs.iter().scan(0, add); + let it = xs.iter().scan(0, add); let mut i = 0; for x in it { assert_eq!(x, ys[i]); @@ -244,7 +244,7 @@ fn test_iterator_scan() { fn test_iterator_flat_map() { let xs = [0, 3, 6]; let ys = [0, 1, 2, 3, 4, 5, 6, 7, 8]; - let mut it = xs.iter().flat_map(|&x| count(x, 1).take(3)); + let it = xs.iter().flat_map(|&x| count(x, 1).take(3)); let mut i = 0; for x in it { assert_eq!(x, ys[i]); @@ -279,7 +279,7 @@ fn test_unfoldr() { } } - let mut it = Unfold::new(0, count); + let it = Unfold::new(0, count); let mut i = 0; for counted in it { assert_eq!(counted, i); diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs index 2dfd81f32c270..03924910e0485 100644 --- a/src/libcoretest/lib.rs +++ b/src/libcoretest/lib.rs @@ -12,6 +12,15 @@ #![feature(int_uint)] #![feature(unboxed_closures)] #![feature(unsafe_destructor)] +#![feature(core)] +#![feature(test)] +#![feature(rand)] +#![feature(unicode)] +#![feature(std_misc)] +#![feature(libc)] +#![feature(hash)] +#![feature(io)] +#![feature(collections)] #![allow(deprecated)] // rand extern crate core; diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 7588bf7c5158e..583c658dfe058 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -32,6 +32,8 @@ #![deprecated(reason = "use the crates.io `rand` library instead", since = "1.0.0-alpha")] +#![cfg_attr(test, feature(test, rand))] + #![allow(deprecated)] #[macro_use] diff --git a/src/librbml/lib.rs b/src/librbml/lib.rs index 4af322089d53d..c48dd7a6ee894 100644 --- a/src/librbml/lib.rs +++ b/src/librbml/lib.rs @@ -32,6 +32,8 @@ #![feature(rustc_private)] #![feature(staged_api)] +#![cfg_attr(test, feature(test))] + extern crate serialize; #[macro_use] extern crate log; diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index ade4f1f0533ee..f5d2b8aed29df 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -88,7 +88,6 @@ impl DefaultResizePolicy { #[test] fn test_resize_policy() { - use prelude::v1::*; let rp = DefaultResizePolicy; for n in 0..1000 { assert!(rp.min_capacity(rp.usable_capacity(n)) <= n); @@ -2256,6 +2255,7 @@ mod test_map { #[test] fn test_entry_take_doesnt_corrupt() { + #![allow(deprecated)] //rand // Test for #19292 fn check(m: &HashMap) { for k in m.keys() { diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 69791084e2f9f..98c1b50a9bf14 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -744,6 +744,8 @@ pub fn set_permissions(path: &P, perm: Permissions) #[cfg(test)] mod tests { + #![allow(deprecated)] //rand + use prelude::v1::*; use io::prelude::*; @@ -1035,7 +1037,7 @@ mod tests { let msg = msg_str.as_bytes(); check!(w.write(msg)); } - let mut files = check!(fs::read_dir(dir)); + let files = check!(fs::read_dir(dir)); let mut mem = [0u8; 4]; for f in files { let f = f.unwrap().path(); @@ -1065,7 +1067,7 @@ mod tests { check!(fs::create_dir_all(dir2)); check!(File::create(&dir2.join("14"))); - let mut files = check!(fs::walk_dir(dir)); + let files = check!(fs::walk_dir(dir)); let mut cur = [0u8; 2]; for f in files { let f = f.unwrap().path(); diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index e9a8dbb4098af..9ef319782369d 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -497,7 +497,6 @@ mod tests { assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]); writer.write(&[9, 10, 11]).unwrap(); - let a: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]; assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]); writer.flush().unwrap(); @@ -593,7 +592,7 @@ mod tests { #[test] fn test_lines() { let in_buf = b"a\nb\nc"; - let mut reader = BufReader::with_capacity(2, in_buf); + let reader = BufReader::with_capacity(2, in_buf); let mut it = reader.lines(); assert_eq!(it.next(), Some(Ok("a".to_string()))); assert_eq!(it.next(), Some(Ok("b".to_string()))); @@ -618,14 +617,14 @@ mod tests { #[test] fn read_char_buffered() { let buf = [195u8, 159u8]; - let mut reader = BufReader::with_capacity(1, &buf[..]); + let reader = BufReader::with_capacity(1, &buf[..]); assert_eq!(reader.chars().next(), Some(Ok('ß'))); } #[test] fn test_chars() { let buf = [195u8, 159u8, b'a']; - let mut reader = BufReader::with_capacity(1, &buf[..]); + let reader = BufReader::with_capacity(1, &buf[..]); let mut it = reader.chars(); assert_eq!(it.next(), Some(Ok('ß'))); assert_eq!(it.next(), Some(Ok('a'))); diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index c38d52161c96e..8ec0e4fe4e4d5 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -869,12 +869,12 @@ mod tests { #[test] fn split() { - let mut buf = Cursor::new(b"12"); + let buf = Cursor::new(b"12"); let mut s = buf.split(b'3'); assert_eq!(s.next(), Some(Ok(vec![b'1', b'2']))); assert_eq!(s.next(), None); - let mut buf = Cursor::new(b"1233"); + let buf = Cursor::new(b"1233"); let mut s = buf.split(b'3'); assert_eq!(s.next(), Some(Ok(vec![b'1', b'2']))); assert_eq!(s.next(), Some(Ok(vec![]))); @@ -902,12 +902,12 @@ mod tests { #[test] fn lines() { - let mut buf = Cursor::new(b"12"); + let buf = Cursor::new(b"12"); let mut s = buf.lines(); assert_eq!(s.next(), Some(Ok("12".to_string()))); assert_eq!(s.next(), None); - let mut buf = Cursor::new(b"12\n\n"); + let buf = Cursor::new(b"12\n\n"); let mut s = buf.lines(); assert_eq!(s.next(), Some(Ok("12".to_string()))); assert_eq!(s.next(), Some(Ok(String::new()))); diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index fbd403ea593b8..7ce545bbcf097 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -109,7 +109,6 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] -#![feature(hash)] #![feature(int_uint)] #![feature(lang_items)] #![feature(libc)] @@ -123,7 +122,7 @@ #![feature(unsafe_destructor)] #![feature(unsafe_no_drop_flag)] #![feature(macro_reexport)] -#![cfg_attr(test, feature(test))] +#![cfg_attr(test, feature(test, rustc_private, env))] // Don't link to std. We are std. #![feature(no_std)] diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index b861b74947eeb..f99cd2b1d1be9 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -456,12 +456,6 @@ mod tests { } } - pub fn socket_name(addr: SocketAddr) { - } - - pub fn peer_name(addr: SocketAddr) { - } - #[test] fn socket_and_peer_name_ip4() { each_ip(&mut |addr| { diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs index 971fb4b69c8ef..c70e92884ac65 100644 --- a/src/libstd/net/test.rs +++ b/src/libstd/net/test.rs @@ -33,7 +33,7 @@ fn base_port() -> u16 { let cwd = env::current_dir().unwrap(); let dirs = ["32-opt", "32-nopt", "64-opt", "64-nopt", "64-opt-vg", "all-opt", "snap3", "dist"]; - dirs.iter().enumerate().find(|&(i, dir)| { + dirs.iter().enumerate().find(|&(_, dir)| { cwd.as_str().unwrap().contains(dir) }).map(|p| p.0).unwrap_or(0) as u16 * 1000 + 19600 } diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index fc3deb67f41ec..b82572fc08957 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -240,6 +240,8 @@ #![unstable(feature = "old_io")] #![deny(unused_must_use)] +#![allow(deprecated)] // seriously this is all deprecated +#![allow(unused_imports)] pub use self::SeekStyle::*; pub use self::FileMode::*; diff --git a/src/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs index e9005aa22bcfb..4f8976fb2ecda 100644 --- a/src/libstd/old_path/mod.rs +++ b/src/libstd/old_path/mod.rs @@ -60,6 +60,8 @@ //! ``` #![unstable(feature = "old_path")] +#![allow(deprecated)] // seriously this is all deprecated +#![allow(unused_imports)] use core::marker::Sized; use ffi::CString; diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 49a5efec7c2e4..88543ad85ed11 100755 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1324,7 +1324,6 @@ impl AsPath for T { #[cfg(test)] mod tests { use super::*; - use ffi::OsStr; use core::prelude::*; use string::{ToString, String}; use vec::Vec; diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 5baa095d35985..86604f62171ef 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -489,18 +489,14 @@ impl Child { mod tests { use io::ErrorKind; use io::prelude::*; - use prelude::v1::{Ok, Err, range, drop, Some, None, Vec}; + use prelude::v1::{Ok, Err, drop, Some, Vec}; use prelude::v1::{String, Clone}; use prelude::v1::{SliceExt, Str, StrExt, AsSlice, ToString, GenericPath}; - use path::Path; use old_path; use old_io::fs::PathExtensions; use rt::running_on_valgrind; use str; - use super::{Child, Command, Output, ExitStatus, Stdio}; - use sync::mpsc::channel; - use thread; - use time::Duration; + use super::{Command, Output, Stdio}; // FIXME(#10380) these tests should not all be ignored on android. diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 3653e7e31d5c6..b6f45eea37765 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -702,7 +702,7 @@ mod test { use boxed::BoxAny; use result; use std::old_io::{ChanReader, ChanWriter}; - use super::{Thread, Builder}; + use super::{Builder}; use thread; use thunk::Thunk; use time::Duration; @@ -767,7 +767,7 @@ mod test { #[test] #[should_fail] fn test_scoped_implicit_panic() { - thread::scoped(|| panic!()); + let _ = thread::scoped(|| panic!()); } #[test]