Skip to content

Commit ff9b75f

Browse files
author
blake2-ppc
committed
Fix warnings in libstd and librusti tests
1 parent e93dd34 commit ff9b75f

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

Diff for: src/librusti/rusti.rs

-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ pub fn main() {
546546
#[cfg(test)]
547547
mod tests {
548548
use std::io;
549-
use std::iterator::IteratorUtil;
550549
use program::Program;
551550
use super::*;
552551

Diff for: src/libstd/hashmap.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ pub type SetAlgebraIter<'self, T> =
863863

864864
#[cfg(test)]
865865
mod test_map {
866-
use container::{Container, Map, Set};
866+
use container::{Container, Map};
867867
use option::{None, Some};
868868
use super::*;
869869
use uint;
@@ -1104,7 +1104,7 @@ mod test_map {
11041104
#[cfg(test)]
11051105
mod test_set {
11061106
use super::*;
1107-
use container::{Container, Map, Set};
1107+
use container::Container;
11081108
use vec::ImmutableEqVector;
11091109
use uint;
11101110

Diff for: src/libstd/os.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,6 @@ mod tests {
17421742
use rand;
17431743
use run;
17441744
use str::StrSlice;
1745-
use vec;
17461745
use vec::CopyableVector;
17471746
use libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};
17481747

Diff for: src/libstd/ptr.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ use option::{Option, Some, None};
1616
use sys;
1717
use unstable::intrinsics;
1818
use util::swap;
19-
use ops::{Add,Sub};
20-
use num::Int;
19+
20+
#[cfg(not(test))] use ops::{Add,Sub};
21+
#[cfg(not(test))] use num::Int;
2122

2223
#[cfg(not(test))] use cmp::{Eq, Ord};
2324
use uint;
@@ -592,7 +593,7 @@ pub mod ptr_tests {
592593
}
593594

594595
let mut xs_mut = xs.clone();
595-
let mut m_start = to_mut_ptr(xs_mut);
596+
let m_start = to_mut_ptr(xs_mut);
596597
let mut m_ptr = m_start + 9u32;
597598

598599
while m_ptr >= m_start {

Diff for: src/libstd/rand.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,6 @@ mod tests {
10781078
// This is to verify that the implementation of the ISAAC rng is
10791079
// correct (i.e. matches the output of the upstream implementation,
10801080
// which is in the runtime)
1081-
use vec;
10821081
use libc::size_t;
10831082

10841083
#[abi = "cdecl"]

Diff for: src/libstd/to_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl<A:ToStr> ToStr for @[A] {
181181
mod tests {
182182
use hashmap::HashMap;
183183
use hashmap::HashSet;
184-
use container::{Set, Map, MutableSet, MutableMap};
184+
use container::{MutableSet, MutableMap};
185185
#[test]
186186
fn test_simple_types() {
187187
assert_eq!(1i.to_str(), ~"1");

Diff for: src/libstd/vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use cast::transmute;
1616
use cast;
1717
use clone::Clone;
1818
use container::{Container, Mutable};
19-
use cmp::{Eq, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
19+
use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
2020
use cmp;
2121
use iterator::*;
2222
use libc::c_void;

0 commit comments

Comments
 (0)