extratest: Fix all leaked trait imports
This commit is contained in:
parent
bcb1c381a3
commit
f47e4b2874
|
@ -624,44 +624,44 @@ impl<A: Clone> Clone for DList<A> {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub fn check_links<T>(list: &DList<T>) {
|
||||
let mut len = 0u;
|
||||
let mut last_ptr: Option<&Node<T>> = None;
|
||||
let mut node_ptr: &Node<T>;
|
||||
match list.list_head {
|
||||
None => { assert_eq!(0u, list.length); return }
|
||||
Some(ref node) => node_ptr = &**node,
|
||||
}
|
||||
loop {
|
||||
match (last_ptr, node_ptr.prev.resolve_immut()) {
|
||||
(None , None ) => {}
|
||||
(None , _ ) => fail!("prev link for list_head"),
|
||||
(Some(p), Some(pptr)) => {
|
||||
assert_eq!(p as *Node<T>, pptr as *Node<T>);
|
||||
}
|
||||
_ => fail!("prev link is none, not good"),
|
||||
}
|
||||
match node_ptr.next {
|
||||
Some(ref next) => {
|
||||
last_ptr = Some(node_ptr);
|
||||
node_ptr = &**next;
|
||||
len += 1;
|
||||
}
|
||||
None => {
|
||||
len += 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(len, list.length);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::rand;
|
||||
use container::Deque;
|
||||
use extra::test;
|
||||
use std::rand;
|
||||
use super::{DList, Node, ListInsertion};
|
||||
|
||||
pub fn check_links<T>(list: &DList<T>) {
|
||||
let mut len = 0u;
|
||||
let mut last_ptr: Option<&Node<T>> = None;
|
||||
let mut node_ptr: &Node<T>;
|
||||
match list.list_head {
|
||||
None => { assert_eq!(0u, list.length); return }
|
||||
Some(ref node) => node_ptr = &**node,
|
||||
}
|
||||
loop {
|
||||
match (last_ptr, node_ptr.prev.resolve_immut()) {
|
||||
(None , None ) => {}
|
||||
(None , _ ) => fail!("prev link for list_head"),
|
||||
(Some(p), Some(pptr)) => {
|
||||
assert_eq!(p as *Node<T>, pptr as *Node<T>);
|
||||
}
|
||||
_ => fail!("prev link is none, not good"),
|
||||
}
|
||||
match node_ptr.next {
|
||||
Some(ref next) => {
|
||||
last_ptr = Some(node_ptr);
|
||||
node_ptr = &**next;
|
||||
len += 1;
|
||||
}
|
||||
None => {
|
||||
len += 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(len, list.length);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_basic() {
|
||||
|
|
|
@ -1333,11 +1333,10 @@ impl to_str::ToStr for Error {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
use super::*;
|
||||
|
||||
use std::io;
|
||||
use serialize::Decodable;
|
||||
use serialize::{Encodable, Decodable};
|
||||
use treemap::TreeMap;
|
||||
|
||||
#[deriving(Eq, Encodable, Decodable)]
|
||||
|
|
|
@ -34,8 +34,6 @@ Rust extras are part of the standard Rust distribution.
|
|||
#[deny(non_camel_case_types)];
|
||||
#[deny(missing_doc)];
|
||||
|
||||
pub use std::os;
|
||||
|
||||
// Utility modules
|
||||
|
||||
pub mod c_vec;
|
||||
|
@ -106,12 +104,4 @@ pub mod serialize;
|
|||
pub mod extra {
|
||||
pub use serialize;
|
||||
pub use test;
|
||||
|
||||
// For bootstrapping.
|
||||
pub use std::clone;
|
||||
pub use std::condition;
|
||||
pub use std::cmp;
|
||||
pub use std::unstable;
|
||||
pub use std::str;
|
||||
pub use std::os;
|
||||
}
|
||||
|
|
|
@ -1434,6 +1434,7 @@ impl BigInt {
|
|||
#[cfg(test)]
|
||||
mod biguint_tests {
|
||||
use super::*;
|
||||
use super::RandBigInt;
|
||||
|
||||
use std::cmp::{Less, Equal, Greater};
|
||||
use std::i64;
|
||||
|
@ -2090,6 +2091,7 @@ mod biguint_tests {
|
|||
#[cfg(test)]
|
||||
mod bigint_tests {
|
||||
use super::*;
|
||||
use super::RandBigInt;
|
||||
|
||||
use std::cmp::{Less, Equal, Greater};
|
||||
use std::i64;
|
||||
|
|
|
@ -404,10 +404,11 @@ impl<A> Extendable<A> for RingBuf<A> {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use container::Deque;
|
||||
use extra::test;
|
||||
use std::clone::Clone;
|
||||
use std::cmp::Eq;
|
||||
use extra::test;
|
||||
use super::RingBuf;
|
||||
|
||||
#[test]
|
||||
fn test_simple() {
|
||||
|
|
|
@ -432,7 +432,6 @@ pub fn freq_count<T: Iterator<U>, U: Eq+Hash>(mut iter: T) -> hashmap::HashMap<U
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
use stats::Stats;
|
||||
use stats::Summary;
|
||||
use stats::write_5_number_summary;
|
||||
|
@ -1018,6 +1017,7 @@ mod tests {
|
|||
mod bench {
|
||||
use extra::test::BenchHarness;
|
||||
use std::vec;
|
||||
use stats::Stats;
|
||||
|
||||
#[bench]
|
||||
fn sum_three_items(bh: &mut BenchHarness) {
|
||||
|
|
|
@ -36,9 +36,10 @@ static RED_ZONE: uint = 20 * 1024;
|
|||
// irrelevant for documentation purposes.
|
||||
#[cfg(not(test))] // in testing, use the original libstd's version
|
||||
pub extern "C" fn rust_stack_exhausted() {
|
||||
use rt::task::Task;
|
||||
use option::None;
|
||||
use rt::local::Local;
|
||||
use rt::task::Task;
|
||||
use str::Str;
|
||||
use unstable::intrinsics;
|
||||
|
||||
unsafe {
|
||||
|
|
Loading…
Reference in a new issue