Skip to content

Fix warnings in tests #7857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix warnings in tests #7857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e93dd34
Fix warnings in libextra tests
Jul 17, 2013
ff9b75f
Fix warnings in libstd and librusti tests
Jul 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/libextra/bitv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,9 +893,9 @@ mod tests {
#[test]
fn test_1_element() {
let mut act = Bitv::new(1u, false);
assert!(act.eq_vec(~[false]));
assert!(act.eq_vec([false]));
act = Bitv::new(1u, true);
assert!(act.eq_vec(~[true]));
assert!(act.eq_vec([true]));
}

#[test]
Expand All @@ -913,11 +913,11 @@ mod tests {

act = Bitv::new(10u, false);
assert!((act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false])));
[false, false, false, false, false, false, false, false, false, false])));
// all 1

act = Bitv::new(10u, true);
assert!((act.eq_vec(~[true, true, true, true, true, true, true, true, true, true])));
assert!((act.eq_vec([true, true, true, true, true, true, true, true, true, true])));
// mixed

act = Bitv::new(10u, false);
Expand All @@ -926,7 +926,7 @@ mod tests {
act.set(2u, true);
act.set(3u, true);
act.set(4u, true);
assert!((act.eq_vec(~[true, true, true, true, true, false, false, false, false, false])));
assert!((act.eq_vec([true, true, true, true, true, false, false, false, false, false])));
// mixed

act = Bitv::new(10u, false);
Expand All @@ -935,15 +935,15 @@ mod tests {
act.set(7u, true);
act.set(8u, true);
act.set(9u, true);
assert!((act.eq_vec(~[false, false, false, false, false, true, true, true, true, true])));
assert!((act.eq_vec([false, false, false, false, false, true, true, true, true, true])));
// mixed

act = Bitv::new(10u, false);
act.set(0u, true);
act.set(3u, true);
act.set(6u, true);
act.set(9u, true);
assert!((act.eq_vec(~[true, false, false, true, false, false, true, false, false, true])));
assert!((act.eq_vec([true, false, false, true, false, false, true, false, false, true])));
}

#[test]
Expand All @@ -953,14 +953,14 @@ mod tests {

act = Bitv::new(31u, false);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false]));
// all 1

act = Bitv::new(31u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
[true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true]));
// mixed
Expand All @@ -975,7 +975,7 @@ mod tests {
act.set(6u, true);
act.set(7u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
[true, true, true, true, true, true, true, true, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false]));
// mixed
Expand All @@ -990,7 +990,7 @@ mod tests {
act.set(22u, true);
act.set(23u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, true, true, true, true, true, true, true,
false, false, false, false, false, false, false]));
// mixed
Expand All @@ -1004,7 +1004,7 @@ mod tests {
act.set(29u, true);
act.set(30u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, true, true, true, true, true, true, true]));
// mixed
Expand All @@ -1014,7 +1014,7 @@ mod tests {
act.set(17u, true);
act.set(30u, true);
assert!(act.eq_vec(
~[false, false, false, true, false, false, false, false, false, false, false, false,
[false, false, false, true, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, false, false, false, false, false, false,
false, false, false, false, false, false, true]));
}
Expand All @@ -1026,14 +1026,14 @@ mod tests {

act = Bitv::new(32u, false);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false]));
// all 1

act = Bitv::new(32u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
[true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true, true]));
// mixed
Expand All @@ -1048,7 +1048,7 @@ mod tests {
act.set(6u, true);
act.set(7u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
[true, true, true, true, true, true, true, true, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false]));
// mixed
Expand All @@ -1063,7 +1063,7 @@ mod tests {
act.set(22u, true);
act.set(23u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, true, true, true, true, true, true, true,
false, false, false, false, false, false, false, false]));
// mixed
Expand All @@ -1078,7 +1078,7 @@ mod tests {
act.set(30u, true);
act.set(31u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, true, true, true, true, true, true, true, true]));
// mixed
Expand All @@ -1089,7 +1089,7 @@ mod tests {
act.set(30u, true);
act.set(31u, true);
assert!(act.eq_vec(
~[false, false, false, true, false, false, false, false, false, false, false, false,
[false, false, false, true, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, false, false, false, false, false, false,
false, false, false, false, false, false, true, true]));
}
Expand All @@ -1101,14 +1101,14 @@ mod tests {

act = Bitv::new(33u, false);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false]));
// all 1

act = Bitv::new(33u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
[true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
true, true, true, true, true, true]));
// mixed
Expand All @@ -1123,7 +1123,7 @@ mod tests {
act.set(6u, true);
act.set(7u, true);
assert!(act.eq_vec(
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
[true, true, true, true, true, true, true, true, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false]));
// mixed
Expand All @@ -1138,7 +1138,7 @@ mod tests {
act.set(22u, true);
act.set(23u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, true, true, true, true, true, true, true,
false, false, false, false, false, false, false, false, false]));
// mixed
Expand All @@ -1153,7 +1153,7 @@ mod tests {
act.set(30u, true);
act.set(31u, true);
assert!(act.eq_vec(
~[false, false, false, false, false, false, false, false, false, false, false,
[false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false,
false, true, true, true, true, true, true, true, true, false]));
// mixed
Expand All @@ -1165,7 +1165,7 @@ mod tests {
act.set(31u, true);
act.set(32u, true);
assert!(act.eq_vec(
~[false, false, false, true, false, false, false, false, false, false, false, false,
[false, false, false, true, false, false, false, false, false, false, false, false,
false, false, false, false, false, true, false, false, false, false, false, false,
false, false, false, false, false, false, true, true, true]));
}
Expand Down
1 change: 0 additions & 1 deletion src/libextra/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@ mod test_qsort {

use sort::*;

use std::int;
use std::vec;

fn check_sort(v1: &mut [int], v2: &mut [int]) {
Expand Down
1 change: 0 additions & 1 deletion src/librusti/rusti.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ pub fn main() {
#[cfg(test)]
mod tests {
use std::io;
use std::iterator::IteratorUtil;
use program::Program;
use super::*;

Expand Down
4 changes: 2 additions & 2 deletions src/libstd/hashmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ pub type SetAlgebraIter<'self, T> =

#[cfg(test)]
mod test_map {
use container::{Container, Map, Set};
use container::{Container, Map};
use option::{None, Some};
use super::*;
use uint;
Expand Down Expand Up @@ -1104,7 +1104,7 @@ mod test_map {
#[cfg(test)]
mod test_set {
use super::*;
use container::{Container, Map, Set};
use container::Container;
use vec::ImmutableEqVector;
use uint;

Expand Down
1 change: 0 additions & 1 deletion src/libstd/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,6 @@ mod tests {
use rand;
use run;
use str::StrSlice;
use vec;
use vec::CopyableVector;
use libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};

Expand Down
7 changes: 4 additions & 3 deletions src/libstd/ptr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ use option::{Option, Some, None};
use sys;
use unstable::intrinsics;
use util::swap;
use ops::{Add,Sub};
use num::Int;

#[cfg(not(test))] use ops::{Add,Sub};
#[cfg(not(test))] use num::Int;

#[cfg(not(test))] use cmp::{Eq, Ord};
use uint;
Expand Down Expand Up @@ -592,7 +593,7 @@ pub mod ptr_tests {
}

let mut xs_mut = xs.clone();
let mut m_start = to_mut_ptr(xs_mut);
let m_start = to_mut_ptr(xs_mut);
let mut m_ptr = m_start + 9u32;

while m_ptr >= m_start {
Expand Down
1 change: 0 additions & 1 deletion src/libstd/rand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,6 @@ mod tests {
// This is to verify that the implementation of the ISAAC rng is
// correct (i.e. matches the output of the upstream implementation,
// which is in the runtime)
use vec;
use libc::size_t;

#[abi = "cdecl"]
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/to_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ impl<A:ToStr> ToStr for @[A] {
mod tests {
use hashmap::HashMap;
use hashmap::HashSet;
use container::{Set, Map, MutableSet, MutableMap};
use container::{MutableSet, MutableMap};
#[test]
fn test_simple_types() {
assert_eq!(1i.to_str(), ~"1");
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use cast::transmute;
use cast;
use clone::Clone;
use container::{Container, Mutable};
use cmp::{Eq, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
use cmp;
use iterator::*;
use libc::c_void;
Expand Down