Skip to content

Commit 97aa340

Browse files
committed
try to reduce bajillion warnings
1 parent 522d09d commit 97aa340

File tree

18 files changed

+58
-51
lines changed

18 files changed

+58
-51
lines changed

src/liballoc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
#![feature(unboxed_closures)]
7474
#![feature(unsafe_no_drop_flag)]
7575
#![feature(core)]
76+
#![cfg_attr(test, feature(test, alloc, rustc_private))]
7677
#![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")),
7778
feature(libc))]
7879

src/libcoretest/fmt/num.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,84 +170,84 @@ mod u32 {
170170
use test::Bencher;
171171
use core::fmt::radix;
172172
use std::rand::{weak_rng, Rng};
173-
use std::old_io::util::NullWriter;
173+
use std::io::{Write, sink};
174174

175175
#[bench]
176176
fn format_bin(b: &mut Bencher) {
177177
let mut rng = weak_rng();
178-
b.iter(|| { write!(&mut NullWriter, "{:b}", rng.gen::<u32>()) })
178+
b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::<u32>()) })
179179
}
180180

181181
#[bench]
182182
fn format_oct(b: &mut Bencher) {
183183
let mut rng = weak_rng();
184-
b.iter(|| { write!(&mut NullWriter, "{:o}", rng.gen::<u32>()) })
184+
b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::<u32>()) })
185185
}
186186

187187
#[bench]
188188
fn format_dec(b: &mut Bencher) {
189189
let mut rng = weak_rng();
190-
b.iter(|| { write!(&mut NullWriter, "{}", rng.gen::<u32>()) })
190+
b.iter(|| { write!(&mut sink(), "{}", rng.gen::<u32>()) })
191191
}
192192

193193
#[bench]
194194
fn format_hex(b: &mut Bencher) {
195195
let mut rng = weak_rng();
196-
b.iter(|| { write!(&mut NullWriter, "{:x}", rng.gen::<u32>()) })
196+
b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::<u32>()) })
197197
}
198198

199199
#[bench]
200200
fn format_show(b: &mut Bencher) {
201201
let mut rng = weak_rng();
202-
b.iter(|| { write!(&mut NullWriter, "{:?}", rng.gen::<u32>()) })
202+
b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::<u32>()) })
203203
}
204204

205205
#[bench]
206206
fn format_base_36(b: &mut Bencher) {
207207
let mut rng = weak_rng();
208-
b.iter(|| { write!(&mut NullWriter, "{}", radix(rng.gen::<u32>(), 36)) })
208+
b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::<u32>(), 36)) })
209209
}
210210
}
211211

212212
mod i32 {
213213
use test::Bencher;
214214
use core::fmt::radix;
215215
use std::rand::{weak_rng, Rng};
216-
use std::old_io::util::NullWriter;
216+
use std::io::{Write, sink};
217217

218218
#[bench]
219219
fn format_bin(b: &mut Bencher) {
220220
let mut rng = weak_rng();
221-
b.iter(|| { write!(&mut NullWriter, "{:b}", rng.gen::<i32>()) })
221+
b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::<i32>()) })
222222
}
223223

224224
#[bench]
225225
fn format_oct(b: &mut Bencher) {
226226
let mut rng = weak_rng();
227-
b.iter(|| { write!(&mut NullWriter, "{:o}", rng.gen::<i32>()) })
227+
b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::<i32>()) })
228228
}
229229

230230
#[bench]
231231
fn format_dec(b: &mut Bencher) {
232232
let mut rng = weak_rng();
233-
b.iter(|| { write!(&mut NullWriter, "{}", rng.gen::<i32>()) })
233+
b.iter(|| { write!(&mut sink(), "{}", rng.gen::<i32>()) })
234234
}
235235

236236
#[bench]
237237
fn format_hex(b: &mut Bencher) {
238238
let mut rng = weak_rng();
239-
b.iter(|| { write!(&mut NullWriter, "{:x}", rng.gen::<i32>()) })
239+
b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::<i32>()) })
240240
}
241241

242242
#[bench]
243243
fn format_show(b: &mut Bencher) {
244244
let mut rng = weak_rng();
245-
b.iter(|| { write!(&mut NullWriter, "{:?}", rng.gen::<i32>()) })
245+
b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::<i32>()) })
246246
}
247247

248248
#[bench]
249249
fn format_base_36(b: &mut Bencher) {
250250
let mut rng = weak_rng();
251-
b.iter(|| { write!(&mut NullWriter, "{}", radix(rng.gen::<i32>(), 36)) })
251+
b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::<i32>(), 36)) })
252252
}
253253
}

src/libcoretest/iter.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn test_iterator_chain() {
8282
let xs = [0, 1, 2, 3, 4, 5];
8383
let ys = [30, 40, 50, 60];
8484
let expected = [0, 1, 2, 3, 4, 5, 30, 40, 50, 60];
85-
let mut it = xs.iter().chain(ys.iter());
85+
let it = xs.iter().chain(ys.iter());
8686
let mut i = 0;
8787
for &x in it {
8888
assert_eq!(x, expected[i]);
@@ -91,7 +91,7 @@ fn test_iterator_chain() {
9191
assert_eq!(i, expected.len());
9292

9393
let ys = count(30, 10).take(4);
94-
let mut it = xs.iter().cloned().chain(ys);
94+
let it = xs.iter().cloned().chain(ys);
9595
let mut i = 0;
9696
for x in it {
9797
assert_eq!(x, expected[i]);
@@ -110,7 +110,7 @@ fn test_filter_map() {
110110
#[test]
111111
fn test_iterator_enumerate() {
112112
let xs = [0, 1, 2, 3, 4, 5];
113-
let mut it = xs.iter().enumerate();
113+
let it = xs.iter().enumerate();
114114
for (i, &x) in it {
115115
assert_eq!(i, x);
116116
}
@@ -152,7 +152,7 @@ fn test_iterator_peekable() {
152152
fn test_iterator_take_while() {
153153
let xs = [0, 1, 2, 3, 5, 13, 15, 16, 17, 19];
154154
let ys = [0, 1, 2, 3, 5, 13];
155-
let mut it = xs.iter().take_while(|&x| *x < 15);
155+
let it = xs.iter().take_while(|&x| *x < 15);
156156
let mut i = 0;
157157
for x in it {
158158
assert_eq!(*x, ys[i]);
@@ -165,7 +165,7 @@ fn test_iterator_take_while() {
165165
fn test_iterator_skip_while() {
166166
let xs = [0, 1, 2, 3, 5, 13, 15, 16, 17, 19];
167167
let ys = [15, 16, 17, 19];
168-
let mut it = xs.iter().skip_while(|&x| *x < 15);
168+
let it = xs.iter().skip_while(|&x| *x < 15);
169169
let mut i = 0;
170170
for x in it {
171171
assert_eq!(*x, ys[i]);
@@ -231,7 +231,7 @@ fn test_iterator_scan() {
231231
let xs = [0, 1, 2, 3, 4];
232232
let ys = [0f64, 1.0, 3.0, 6.0, 10.0];
233233

234-
let mut it = xs.iter().scan(0, add);
234+
let it = xs.iter().scan(0, add);
235235
let mut i = 0;
236236
for x in it {
237237
assert_eq!(x, ys[i]);
@@ -244,7 +244,7 @@ fn test_iterator_scan() {
244244
fn test_iterator_flat_map() {
245245
let xs = [0, 3, 6];
246246
let ys = [0, 1, 2, 3, 4, 5, 6, 7, 8];
247-
let mut it = xs.iter().flat_map(|&x| count(x, 1).take(3));
247+
let it = xs.iter().flat_map(|&x| count(x, 1).take(3));
248248
let mut i = 0;
249249
for x in it {
250250
assert_eq!(x, ys[i]);
@@ -279,7 +279,7 @@ fn test_unfoldr() {
279279
}
280280
}
281281

282-
let mut it = Unfold::new(0, count);
282+
let it = Unfold::new(0, count);
283283
let mut i = 0;
284284
for counted in it {
285285
assert_eq!(counted, i);

src/libcoretest/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
#![feature(int_uint)]
1313
#![feature(unboxed_closures)]
1414
#![feature(unsafe_destructor)]
15+
#![feature(core)]
16+
#![feature(test)]
17+
#![feature(rand)]
18+
#![feature(unicode)]
19+
#![feature(std_misc)]
20+
#![feature(libc)]
21+
#![feature(hash)]
22+
#![feature(io)]
23+
#![feature(collections)]
1524
#![allow(deprecated)] // rand
1625

1726
extern crate core;

src/librand/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#![deprecated(reason = "use the crates.io `rand` library instead",
3333
since = "1.0.0-alpha")]
3434

35+
#![cfg_attr(test, feature(test, rand))]
36+
3537
#![allow(deprecated)]
3638

3739
#[macro_use]

src/librbml/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#![feature(rustc_private)]
3333
#![feature(staged_api)]
3434

35+
#![cfg_attr(test, feature(test))]
36+
3537
extern crate serialize;
3638
#[macro_use] extern crate log;
3739

src/libstd/collections/hash/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ impl DefaultResizePolicy {
8888

8989
#[test]
9090
fn test_resize_policy() {
91-
use prelude::v1::*;
9291
let rp = DefaultResizePolicy;
9392
for n in 0..1000 {
9493
assert!(rp.min_capacity(rp.usable_capacity(n)) <= n);
@@ -2256,6 +2255,7 @@ mod test_map {
22562255

22572256
#[test]
22582257
fn test_entry_take_doesnt_corrupt() {
2258+
#![allow(deprecated)] //rand
22592259
// Test for #19292
22602260
fn check(m: &HashMap<isize, ()>) {
22612261
for k in m.keys() {

src/libstd/fs.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,8 @@ pub fn set_permissions<P: AsPath + ?Sized>(path: &P, perm: Permissions)
744744

745745
#[cfg(test)]
746746
mod tests {
747+
#![allow(deprecated)] //rand
748+
747749
use prelude::v1::*;
748750
use io::prelude::*;
749751

@@ -1035,7 +1037,7 @@ mod tests {
10351037
let msg = msg_str.as_bytes();
10361038
check!(w.write(msg));
10371039
}
1038-
let mut files = check!(fs::read_dir(dir));
1040+
let files = check!(fs::read_dir(dir));
10391041
let mut mem = [0u8; 4];
10401042
for f in files {
10411043
let f = f.unwrap().path();
@@ -1065,7 +1067,7 @@ mod tests {
10651067
check!(fs::create_dir_all(dir2));
10661068
check!(File::create(&dir2.join("14")));
10671069

1068-
let mut files = check!(fs::walk_dir(dir));
1070+
let files = check!(fs::walk_dir(dir));
10691071
let mut cur = [0u8; 2];
10701072
for f in files {
10711073
let f = f.unwrap().path();

src/libstd/io/buffered.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ mod tests {
497497
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]);
498498

499499
writer.write(&[9, 10, 11]).unwrap();
500-
let a: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
501500
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
502501

503502
writer.flush().unwrap();
@@ -593,7 +592,7 @@ mod tests {
593592
#[test]
594593
fn test_lines() {
595594
let in_buf = b"a\nb\nc";
596-
let mut reader = BufReader::with_capacity(2, in_buf);
595+
let reader = BufReader::with_capacity(2, in_buf);
597596
let mut it = reader.lines();
598597
assert_eq!(it.next(), Some(Ok("a".to_string())));
599598
assert_eq!(it.next(), Some(Ok("b".to_string())));
@@ -618,14 +617,14 @@ mod tests {
618617
#[test]
619618
fn read_char_buffered() {
620619
let buf = [195u8, 159u8];
621-
let mut reader = BufReader::with_capacity(1, &buf[..]);
620+
let reader = BufReader::with_capacity(1, &buf[..]);
622621
assert_eq!(reader.chars().next(), Some(Ok('ß')));
623622
}
624623

625624
#[test]
626625
fn test_chars() {
627626
let buf = [195u8, 159u8, b'a'];
628-
let mut reader = BufReader::with_capacity(1, &buf[..]);
627+
let reader = BufReader::with_capacity(1, &buf[..]);
629628
let mut it = reader.chars();
630629
assert_eq!(it.next(), Some(Ok('ß')));
631630
assert_eq!(it.next(), Some(Ok('a')));

src/libstd/io/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,12 +869,12 @@ mod tests {
869869

870870
#[test]
871871
fn split() {
872-
let mut buf = Cursor::new(b"12");
872+
let buf = Cursor::new(b"12");
873873
let mut s = buf.split(b'3');
874874
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
875875
assert_eq!(s.next(), None);
876876

877-
let mut buf = Cursor::new(b"1233");
877+
let buf = Cursor::new(b"1233");
878878
let mut s = buf.split(b'3');
879879
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
880880
assert_eq!(s.next(), Some(Ok(vec![])));
@@ -902,12 +902,12 @@ mod tests {
902902

903903
#[test]
904904
fn lines() {
905-
let mut buf = Cursor::new(b"12");
905+
let buf = Cursor::new(b"12");
906906
let mut s = buf.lines();
907907
assert_eq!(s.next(), Some(Ok("12".to_string())));
908908
assert_eq!(s.next(), None);
909909

910-
let mut buf = Cursor::new(b"12\n\n");
910+
let buf = Cursor::new(b"12\n\n");
911911
let mut s = buf.lines();
912912
assert_eq!(s.next(), Some(Ok("12".to_string())));
913913
assert_eq!(s.next(), Some(Ok(String::new())));

src/libstd/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
#![feature(box_syntax)]
110110
#![feature(collections)]
111111
#![feature(core)]
112-
#![feature(hash)]
113112
#![feature(int_uint)]
114113
#![feature(lang_items)]
115114
#![feature(libc)]
@@ -123,7 +122,7 @@
123122
#![feature(unsafe_destructor)]
124123
#![feature(unsafe_no_drop_flag)]
125124
#![feature(macro_reexport)]
126-
#![cfg_attr(test, feature(test))]
125+
#![cfg_attr(test, feature(test, rustc_private, env))]
127126

128127
// Don't link to std. We are std.
129128
#![feature(no_std)]

src/libstd/net/tcp.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,6 @@ mod tests {
456456
}
457457
}
458458

459-
pub fn socket_name(addr: SocketAddr) {
460-
}
461-
462-
pub fn peer_name(addr: SocketAddr) {
463-
}
464-
465459
#[test]
466460
fn socket_and_peer_name_ip4() {
467461
each_ip(&mut |addr| {

src/libstd/net/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn base_port() -> u16 {
3333
let cwd = env::current_dir().unwrap();
3434
let dirs = ["32-opt", "32-nopt", "64-opt", "64-nopt", "64-opt-vg",
3535
"all-opt", "snap3", "dist"];
36-
dirs.iter().enumerate().find(|&(i, dir)| {
36+
dirs.iter().enumerate().find(|&(_, dir)| {
3737
cwd.as_str().unwrap().contains(dir)
3838
}).map(|p| p.0).unwrap_or(0) as u16 * 1000 + 19600
3939
}

src/libstd/old_io/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@
240240
241241
#![unstable(feature = "old_io")]
242242
#![deny(unused_must_use)]
243+
#![allow(deprecated)] // seriously this is all deprecated
244+
#![allow(unused_imports)]
243245

244246
pub use self::SeekStyle::*;
245247
pub use self::FileMode::*;

src/libstd/old_path/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
//! ```
6161
6262
#![unstable(feature = "old_path")]
63+
#![allow(deprecated)] // seriously this is all deprecated
64+
#![allow(unused_imports)]
6365

6466
use core::marker::Sized;
6567
use ffi::CString;

src/libstd/path.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,6 @@ impl<T: AsOsStr + ?Sized> AsPath for T {
13241324
#[cfg(test)]
13251325
mod tests {
13261326
use super::*;
1327-
use ffi::OsStr;
13281327
use core::prelude::*;
13291328
use string::{ToString, String};
13301329
use vec::Vec;

0 commit comments

Comments
 (0)