Skip to content

Commit 0a0f87b

Browse files
committed
auto merge of #11918 : omasanori/rust/reduce-warnings, r=alexcrichton
Moving forward to green waterfall.
2 parents f910a97 + 5281d87 commit 0a0f87b

File tree

9 files changed

+5
-14
lines changed

9 files changed

+5
-14
lines changed

src/libstd/io/extensions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ mod test {
366366
fn push_bytes_fail_reset_len() {
367367
// push_bytes unsafely sets the vector length. This is testing that
368368
// upon failure the length is reset correctly.
369-
let reader = ErroringLaterReader {
369+
let _reader = ErroringLaterReader {
370370
count: 0,
371371
};
372372
// FIXME (#7049): Figure out some other way to do this.

src/libstd/io/net/addrinfo.rs

-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ fn lookup(hostname: Option<&str>, servname: Option<&str>, hint: Option<Hint>)
102102
// permission without help of apk
103103
#[cfg(test, not(target_os = "android"))]
104104
mod test {
105-
use io::net::ip::Ipv4Addr;
106-
use prelude::*;
107-
use super::*;
108-
109105
iotest!(fn dns_smoke_test() {
110106
let ipaddrs = get_host_addresses("localhost").unwrap();
111107
let mut found_local = false;

src/libstd/io/net/tcp.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ mod test {
632632

633633
spawn(proc() {
634634
port.recv();
635-
let stream = TcpStream::connect(addr);
635+
let _stream = TcpStream::connect(addr);
636636
// Close
637637
port.recv();
638638
});
@@ -641,12 +641,12 @@ mod test {
641641
let mut acceptor = TcpListener::bind(addr).listen();
642642
chan.send(());
643643
{
644-
let stream = acceptor.accept();
644+
let _stream = acceptor.accept();
645645
// Close client
646646
chan.send(());
647647
}
648648
// Close listener
649649
}
650-
let listener = TcpListener::bind(addr);
650+
let _listener = TcpListener::bind(addr);
651651
})
652652
}

src/libstd/num/f32.rs

-1
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,6 @@ mod tests {
907907

908908
use num::*;
909909
use num;
910-
use mem;
911910

912911
#[test]
913912
fn test_num() {

src/libstd/num/f64.rs

-1
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,6 @@ mod tests {
909909

910910
use num::*;
911911
use num;
912-
use mem;
913912

914913
#[test]
915914
fn test_num() {

src/libstd/num/int_macros.rs

-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@ mod tests {
444444
use num;
445445
use num::CheckedDiv;
446446
use num::Bitwise;
447-
use mem;
448447

449448
#[test]
450449
fn test_num() {

src/libstd/num/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,6 @@ pub fn test_num<T:Num + NumCast>(ten: T, two: T) {
10751075
mod tests {
10761076
use prelude::*;
10771077
use super::*;
1078-
use num;
10791078
use i8;
10801079
use i16;
10811080
use i32;

src/libstd/num/uint_macros.rs

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ mod tests {
315315
use num;
316316
use num::CheckedDiv;
317317
use num::Bitwise;
318-
use mem;
319318
use u16;
320319

321320
#[test]

src/libstd/rt/unwind.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ mod libunwind {
7777
//! Unwind library interface
7878
7979
#[allow(non_camel_case_types)];
80-
#[allow(dead_code)] // these are just bindings
80+
#[allow(dead_code)]; // these are just bindings
8181

8282
use libc::{uintptr_t};
8383

0 commit comments

Comments
 (0)