From 7e0443d6c4e683105f20de85dc4591cc5cf2518d Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 6 Jan 2014 16:48:51 -0800 Subject: std: Fill in all missing imports Fallout from the previous commits --- src/libstd/rt/borrowck.rs | 4 +++- src/libstd/rt/crate_map.rs | 2 ++ src/libstd/rt/global_heap.rs | 1 + src/libstd/rt/local_heap.rs | 3 +++ src/libstd/rt/local_ptr.rs | 3 +++ src/libstd/rt/logging.rs | 5 ++++- src/libstd/rt/mod.rs | 5 ----- src/libstd/rt/task.rs | 1 + src/libstd/rt/unwind.rs | 1 + src/libstd/rt/util.rs | 2 ++ 10 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libstd/rt/borrowck.rs b/src/libstd/rt/borrowck.rs index d1e97cb6ec0..7dcbae995ed 100644 --- a/src/libstd/rt/borrowck.rs +++ b/src/libstd/rt/borrowck.rs @@ -9,6 +9,8 @@ // except according to those terms. use c_str::{ToCStr, CString}; +use container::Container; +use iter::Iterator; use libc::{c_char, size_t}; use option::{Option, None, Some}; use ptr::RawPtr; @@ -19,7 +21,7 @@ use str::OwnedStr; use str; use uint; use unstable::raw; -use vec::ImmutableVector; +use vec::{ImmutableVector, OwnedVector}; pub static FROZEN_BIT: uint = 1 << (uint::bits - 1); pub static MUT_BIT: uint = 1 << (uint::bits - 2); diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index d9b40cfbb6e..16c1ad25448 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -10,7 +10,9 @@ use container::MutableSet; use hashmap::HashSet; +use iter::Iterator; use option::{Some, None, Option}; +use ptr::RawPtr; use vec::ImmutableVector; use rt::rtio::EventLoop; diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index c094344f6b9..7a417990a4c 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -9,6 +9,7 @@ // except according to those terms. use libc::{c_void, c_char, size_t, uintptr_t, free, malloc, realloc}; +use ptr::RawPtr; use unstable::intrinsics::TyDesc; use unstable::raw; use mem::size_of; diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs index f2edc6e7ede..1be942b2db1 100644 --- a/src/libstd/rt/local_heap.rs +++ b/src/libstd/rt/local_heap.rs @@ -11,18 +11,21 @@ //! The local, garbage collected heap use cast; +use iter::Iterator; use libc::{c_void, uintptr_t}; use libc; use mem; use ops::Drop; use option::{Option, None, Some}; use ptr; +use ptr::RawPtr; use rt::env; use rt::global_heap; use rt::local::Local; use rt::task::Task; use unstable::intrinsics::TyDesc; use unstable::raw; +use vec::ImmutableVector; // This has no meaning with out rtdebug also turned on. #[cfg(rtdebug)] diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs index 546a6476b57..f4efd8e27d0 100644 --- a/src/libstd/rt/local_ptr.rs +++ b/src/libstd/rt/local_ptr.rs @@ -19,6 +19,7 @@ use cast; use ops::Drop; +use ptr::RawPtr; #[cfg(windows)] // mingw-w32 doesn't like thread_local things #[cfg(target_os = "android")] // see #10686 @@ -79,6 +80,7 @@ pub unsafe fn borrow() -> Borrowed { pub mod compiled { use cast; use option::{Option, Some, None}; + use ptr::RawPtr; #[cfg(not(test))] use libc::c_void; #[cfg(test)] @@ -177,6 +179,7 @@ pub mod native { use libc::c_void; use option::{Option, Some, None}; use ptr; + use ptr::RawPtr; use tls = rt::thread_local_storage; static mut RT_TLS_KEY: tls::Key = -1; diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index 586d26a24e3..2004dac0c7c 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -8,12 +8,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use container::Container; +use fmt; use from_str::from_str; +use iter::Iterator; use libc::exit; use option::{Some, None, Option}; use rt::crate_map::{ModEntry, CrateMap, iter_crate_map, get_crate_map}; use str::StrSlice; -use vec::{ImmutableVector, MutableTotalOrdVector}; +use vec::{ImmutableVector, MutableTotalOrdVector, OwnedVector}; #[cfg(test)] use cast::transmute; struct LogDirective { diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 050caef86eb..d839ef62af9 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -58,14 +58,9 @@ Several modules in `core` are clients of `rt`: #[allow(missing_doc)]; use any::Any; -use clone::Clone; -use container::Container; -use iter::Iterator; use option::Option; -use ptr::RawPtr; use result::Result; use task::TaskOpts; -use vec::{OwnedVector, MutableVector, ImmutableVector}; use self::task::{Task, BlockedTask}; diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 2d9105d6766..6c94f237789 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -17,6 +17,7 @@ use any::AnyOwnExt; use borrow; use cast; use cleanup; +use clone::Clone; use io::Writer; use iter::{Iterator, Take}; use local_data; diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index cb5360200d5..56dc2288a40 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -62,6 +62,7 @@ use kinds::Send; use libc::{c_void, c_char, size_t}; use option::{Some, None, Option}; use prelude::drop; +use ptr::RawPtr; use result::{Err, Ok}; use rt::local::Local; use rt::task::Task; diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 730a38ce886..ee336d7d847 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -11,11 +11,13 @@ use container::Container; use fmt; use from_str::FromStr; +use iter::Iterator; use libc; use option::{Some, None, Option}; use os; use str::StrSlice; use unstable::running_on_valgrind; +use vec::ImmutableVector; // Indicates whether we should perform expensive sanity checks, including rtassert! // XXX: Once the runtime matures remove the `true` below to turn off rtassert, etc. -- cgit 1.4.1-3-g733a5 From c4d36b85a0181575319168ab080989c71b935b20 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 6 Jan 2014 19:05:53 -0800 Subject: Fix remaining cases of leaking imports --- src/libextra/lib.rs | 2 -- src/librustc/middle/borrowck/gather_loans/lifetime.rs | 1 + src/librustc/middle/typeck/astconv.rs | 1 + src/librustc/middle/typeck/check/method.rs | 1 + src/librustc/middle/typeck/check/mod.rs | 2 +- src/librustc/middle/typeck/check/regionck.rs | 7 ++++--- src/librustc/middle/typeck/check/vtable.rs | 2 ++ src/librustc/middle/typeck/check/writeback.rs | 2 ++ src/librustc/middle/typeck/coherence.rs | 1 + src/librustc/middle/typeck/collect.rs | 1 + src/librustc/middle/typeck/infer/coercion.rs | 2 +- src/librustc/middle/typeck/infer/combine.rs | 2 ++ src/librustc/middle/typeck/infer/glb.rs | 1 + src/librustc/middle/typeck/infer/lattice.rs | 1 + src/librustc/middle/typeck/infer/lub.rs | 1 + src/librustc/middle/typeck/infer/mod.rs | 1 - src/librustc/middle/typeck/infer/region_inference/mod.rs | 2 +- src/librustc/middle/typeck/infer/sub.rs | 3 ++- src/librustc/middle/typeck/variance.rs | 1 + src/librustpkg/api.rs | 1 + src/librustpkg/util.rs | 1 + src/librustuv/lib.rs | 1 - src/librustuv/net.rs | 1 + src/libstd/num/int_macros.rs | 1 + src/libstd/num/uint_macros.rs | 1 + src/libstd/os.rs | 8 +++++--- src/libstd/rand/os.rs | 3 +++ src/libstd/rt/args.rs | 2 ++ src/libstd/unstable/dynamic_lib.rs | 5 +++-- src/libstd/unstable/mutex.rs | 2 ++ src/libsyntax/ext/deriving/mod.rs | 1 - 31 files changed, 44 insertions(+), 17 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs index b644f53b2c2..28e426d1ccf 100644 --- a/src/libextra/lib.rs +++ b/src/libextra/lib.rs @@ -34,8 +34,6 @@ Rust extras are part of the standard Rust distribution. #[deny(non_camel_case_types)]; #[deny(missing_doc)]; -use std::str::{StrSlice, OwnedStr}; - pub use std::os; // Utility modules diff --git a/src/librustc/middle/borrowck/gather_loans/lifetime.rs b/src/librustc/middle/borrowck/gather_loans/lifetime.rs index 9a56ec52cce..a7f75b9dcc1 100644 --- a/src/librustc/middle/borrowck/gather_loans/lifetime.rs +++ b/src/librustc/middle/borrowck/gather_loans/lifetime.rs @@ -16,6 +16,7 @@ use middle::borrowck::*; use mc = middle::mem_categorization; use middle::ty; +use util::ppaux::Repr; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 746389c6044..76378d15bae 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -57,6 +57,7 @@ use middle::ty; use middle::typeck::rscope; use middle::typeck::rscope::{RegionScope}; use middle::typeck::lookup_def_tcx; +use util::ppaux::Repr; use std::vec; use syntax::abi::AbiSet; diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs index 3bd1f45a071..9c359f238f8 100644 --- a/src/librustc/middle/typeck/check/method.rs +++ b/src/librustc/middle/typeck/check/method.rs @@ -83,6 +83,7 @@ obtained the type `Foo`, we would never match this method. use middle::resolve; use middle::ty::*; use middle::ty; +use middle::typeck::astconv::AstConv; use middle::typeck::check::{FnCtxt, impl_self_ty}; use middle::typeck::check::{structurally_resolved_type}; use middle::typeck::check::vtable; diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 4ebf41b3d4d..41757b1a634 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -107,8 +107,8 @@ use middle::typeck::no_params; use middle::typeck::{require_same_types, method_map, vtable_map}; use middle::lang_items::TypeIdLangItem; use util::common::{block_query, indenter, loop_query}; -use util::ppaux::UserString; use util::ppaux; +use util::ppaux::{UserString, Repr}; use std::cell::{Cell, RefCell}; use std::hashmap::HashMap; diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs index fb914779cce..406b0a56e35 100644 --- a/src/librustc/middle/typeck/check/regionck.rs +++ b/src/librustc/middle/typeck/check/regionck.rs @@ -31,13 +31,14 @@ this point a bit better. use middle::freevars::get_freevars; use middle::ty::{ReScope}; use middle::ty; +use middle::typeck::astconv::AstConv; use middle::typeck::check::FnCtxt; use middle::typeck::check::regionmanip::relate_nested_regions; use middle::typeck::infer::resolve_and_force_all_but_regions; use middle::typeck::infer::resolve_type; use middle::typeck::infer; -use util::ppaux::{ty_to_str, region_to_str}; use middle::pat_util; +use util::ppaux::{ty_to_str, region_to_str, Repr}; use syntax::ast::{ManagedSigil, OwnedSigil, BorrowedSigil}; use syntax::ast::{DefArg, DefBinding, DefLocal, DefSelf, DefUpvar}; @@ -833,14 +834,14 @@ pub mod guarantor { * but more special purpose. */ - + use middle::typeck::astconv::AstConv; use middle::typeck::check::regionck::Rcx; use middle::typeck::check::regionck::mk_subregion_due_to_derefence; use middle::typeck::infer; use middle::ty; use syntax::ast; use syntax::codemap::Span; - use util::ppaux::{ty_to_str}; + use util::ppaux::{ty_to_str, Repr}; pub fn for_addr_of(rcx: &mut Rcx, expr: &ast::Expr, base: &ast::Expr) { /*! diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs index b12f5396887..208ba615d23 100644 --- a/src/librustc/middle/typeck/check/vtable.rs +++ b/src/librustc/middle/typeck/check/vtable.rs @@ -12,6 +12,7 @@ use middle::ty; use middle::ty::{AutoAddEnv, AutoDerefRef, AutoObject, param_ty}; use middle::ty_fold::TypeFolder; +use middle::typeck::astconv::AstConv; use middle::typeck::check::{FnCtxt, impl_self_ty}; use middle::typeck::check::{structurally_resolved_type}; use middle::typeck::infer::fixup_err_to_str; @@ -23,6 +24,7 @@ use middle::typeck::{param_numbered, param_self, param_index}; use middle::subst::Subst; use util::common::indenter; use util::ppaux; +use util::ppaux::Repr; use std::cell::RefCell; use std::hashmap::HashSet; diff --git a/src/librustc/middle/typeck/check/writeback.rs b/src/librustc/middle/typeck/check/writeback.rs index ce9f8ba2212..9305ddcc5d1 100644 --- a/src/librustc/middle/typeck/check/writeback.rs +++ b/src/librustc/middle/typeck/check/writeback.rs @@ -15,6 +15,7 @@ use middle::pat_util; use middle::ty; +use middle::typeck::astconv::AstConv; use middle::typeck::check::{FnCtxt, SelfInfo}; use middle::typeck::infer::{force_all, resolve_all, resolve_region}; use middle::typeck::infer::resolve_type; @@ -25,6 +26,7 @@ use middle::typeck::method_map_entry; use middle::typeck::write_substs_to_tcx; use middle::typeck::write_ty_to_tcx; use util::ppaux; +use util::ppaux::Repr; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs index 39c483241cb..177b8d9fafc 100644 --- a/src/librustc/middle/typeck/coherence.rs +++ b/src/librustc/middle/typeck/coherence.rs @@ -34,6 +34,7 @@ use middle::typeck::infer::combine::Combine; use middle::typeck::infer::InferCtxt; use middle::typeck::infer::{new_infer_ctxt, resolve_ivar, resolve_type}; use middle::typeck::infer; +use util::ppaux::Repr; use syntax::ast::{Crate, DefId, DefStruct, DefTy}; use syntax::ast::{item, item_enum, item_impl, item_mod, item_struct}; use syntax::ast::{LOCAL_CRATE, trait_ref, ty_path}; diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 9a76a6b10c3..a713ada3706 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -42,6 +42,7 @@ use middle::typeck::astconv; use middle::typeck::rscope::*; use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx}; use util::ppaux; +use util::ppaux::Repr; use std::vec; use syntax::abi::AbiSet; diff --git a/src/librustc/middle/typeck/infer/coercion.rs b/src/librustc/middle/typeck/infer/coercion.rs index a2f94a174cf..8a3cc5de0d4 100644 --- a/src/librustc/middle/typeck/infer/coercion.rs +++ b/src/librustc/middle/typeck/infer/coercion.rs @@ -71,7 +71,7 @@ use middle::ty::{vstore_slice, vstore_box, vstore_uniq}; use middle::ty::{mt}; use middle::ty; use middle::typeck::infer::{CoerceResult, resolve_type, Coercion}; -use middle::typeck::infer::combine::CombineFields; +use middle::typeck::infer::combine::{CombineFields, Combine}; use middle::typeck::infer::sub::Sub; use middle::typeck::infer::to_str::InferStr; use middle::typeck::infer::resolve::try_resolve_tvar_shallow; diff --git a/src/librustc/middle/typeck/infer/combine.rs b/src/librustc/middle/typeck/infer/combine.rs index 8d949cc1bc9..7c232c8168f 100644 --- a/src/librustc/middle/typeck/infer/combine.rs +++ b/src/librustc/middle/typeck/infer/combine.rs @@ -51,6 +51,7 @@ use middle::ty::{FloatVar, FnSig, IntVar, TyVar}; use middle::ty::{IntType, UintType, substs}; use middle::ty::{BuiltinBounds}; use middle::ty; +use middle::typeck::infer::{then, ToUres}; use middle::typeck::infer::glb::Glb; use middle::typeck::infer::lub::Lub; use middle::typeck::infer::sub::Sub; @@ -59,6 +60,7 @@ use middle::typeck::infer::unify::InferCtxtMethods; use middle::typeck::infer::{InferCtxt, cres, ures}; use middle::typeck::infer::{TypeTrace}; use util::common::indent; +use util::ppaux::Repr; use std::result; use syntax::ast::{Onceness, purity}; diff --git a/src/librustc/middle/typeck/infer/glb.rs b/src/librustc/middle/typeck/infer/glb.rs index 7222e28b6e1..137ba657ad5 100644 --- a/src/librustc/middle/typeck/infer/glb.rs +++ b/src/librustc/middle/typeck/infer/glb.rs @@ -12,6 +12,7 @@ use middle::ty::{BuiltinBounds}; use middle::ty::RegionVid; use middle::ty; +use middle::typeck::infer::then; use middle::typeck::infer::combine::*; use middle::typeck::infer::lattice::*; use middle::typeck::infer::lub::Lub; diff --git a/src/librustc/middle/typeck/infer/lattice.rs b/src/librustc/middle/typeck/infer/lattice.rs index b448c33b8d0..69bc3e13113 100644 --- a/src/librustc/middle/typeck/infer/lattice.rs +++ b/src/librustc/middle/typeck/infer/lattice.rs @@ -35,6 +35,7 @@ use middle::ty::{RegionVid, TyVar, Vid}; use middle::ty; +use middle::typeck::infer::{then, ToUres}; use middle::typeck::infer::*; use middle::typeck::infer::combine::*; use middle::typeck::infer::glb::Glb; diff --git a/src/librustc/middle/typeck/infer/lub.rs b/src/librustc/middle/typeck/infer/lub.rs index 439de728b7c..0cb16c8fbfb 100644 --- a/src/librustc/middle/typeck/infer/lub.rs +++ b/src/librustc/middle/typeck/infer/lub.rs @@ -12,6 +12,7 @@ use middle::ty::{BuiltinBounds}; use middle::ty::RegionVid; use middle::ty; +use middle::typeck::infer::then; use middle::typeck::infer::combine::*; use middle::typeck::infer::glb::Glb; use middle::typeck::infer::lattice::*; diff --git a/src/librustc/middle/typeck/infer/mod.rs b/src/librustc/middle/typeck/infer/mod.rs index 63a1e869437..91c1a62b72f 100644 --- a/src/librustc/middle/typeck/infer/mod.rs +++ b/src/librustc/middle/typeck/infer/mod.rs @@ -45,7 +45,6 @@ use syntax::codemap; use syntax::codemap::Span; use util::common::indent; use util::ppaux::{bound_region_to_str, ty_to_str, trait_ref_to_str, Repr}; -use util::ppaux::{UserString}; pub mod doc; pub mod macros; diff --git a/src/librustc/middle/typeck/infer/region_inference/mod.rs b/src/librustc/middle/typeck/infer/region_inference/mod.rs index 6a338c73e9b..b5e67361378 100644 --- a/src/librustc/middle/typeck/infer/region_inference/mod.rs +++ b/src/librustc/middle/typeck/infer/region_inference/mod.rs @@ -12,7 +12,7 @@ use middle::ty; -use middle::ty::{FreeRegion, Region, RegionVid}; +use middle::ty::{FreeRegion, Region, RegionVid, Vid}; use middle::ty::{ReEmpty, ReStatic, ReInfer, ReFree, ReEarlyBound, ReLateBound}; use middle::ty::{ReScope, ReVar, ReSkolemized, BrFresh}; diff --git a/src/librustc/middle/typeck/infer/sub.rs b/src/librustc/middle/typeck/infer/sub.rs index e82ae114b9c..81faec297a1 100644 --- a/src/librustc/middle/typeck/infer/sub.rs +++ b/src/librustc/middle/typeck/infer/sub.rs @@ -14,11 +14,12 @@ use middle::ty; use middle::ty::TyVar; use middle::typeck::check::regionmanip::replace_bound_regions_in_fn_sig; use middle::typeck::infer::combine::*; -use middle::typeck::infer::cres; +use middle::typeck::infer::{cres, CresCompare}; use middle::typeck::infer::glb::Glb; use middle::typeck::infer::InferCtxt; use middle::typeck::infer::lattice::CombineFieldsLatticeMethods; use middle::typeck::infer::lub::Lub; +use middle::typeck::infer::then; use middle::typeck::infer::to_str::InferStr; use middle::typeck::infer::{TypeTrace, Subtype}; use util::common::{indenter}; diff --git a/src/librustc/middle/typeck/variance.rs b/src/librustc/middle/typeck/variance.rs index 7f7bcf202ab..6ddb023066e 100644 --- a/src/librustc/middle/typeck/variance.rs +++ b/src/librustc/middle/typeck/variance.rs @@ -204,6 +204,7 @@ use syntax::parse::token; use syntax::opt_vec; use syntax::visit; use syntax::visit::Visitor; +use util::ppaux::Repr; pub fn infer_variance(tcx: ty::ctxt, crate: &ast::Crate) { diff --git a/src/librustpkg/api.rs b/src/librustpkg/api.rs index 45c37a93e3e..2a1728e2e6b 100644 --- a/src/librustpkg/api.rs +++ b/src/librustpkg/api.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use CtxMethods; use context::*; use crate::*; use crate_id::*; diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index 4c533860c57..8111c8a805d 100644 --- a/src/librustpkg/util.rs +++ b/src/librustpkg/util.rs @@ -28,6 +28,7 @@ use syntax::visit::Visitor; use syntax::util::small_vector::SmallVector; use rustc::back::link::output_type_exe; use rustc::back::link; +use CtxMethods; use context::{in_target, StopBefore, Link, Assemble, BuildContext}; use crate_id::CrateId; use package_source::PkgSrc; diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index ccfa5a51b6a..675e852ebae 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -54,7 +54,6 @@ use std::rt::task::{BlockedTask, Task}; use std::str::raw::from_c_str; use std::str; use std::task; -use std::unstable::finally::Finally; pub use self::async::AsyncWatcher; pub use self::file::{FsRequest, FileWatcher}; diff --git a/src/librustuv/net.rs b/src/librustuv/net.rs index 85e9202c1fa..ee78585fcfd 100644 --- a/src/librustuv/net.rs +++ b/src/librustuv/net.rs @@ -17,6 +17,7 @@ use std::ptr; use std::rt::rtio; use std::rt::task::BlockedTask; use std::str; +use std::unstable::finally::Finally; use std::vec; use homing::{HomingIO, HomeHandle}; diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index a08faf66199..0e7e4277dd6 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -445,6 +445,7 @@ mod tests { use int; use i32; use num; + use num::CheckedDiv; use mem; #[test] diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 6da3e43a5d6..1a256981d74 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -324,6 +324,7 @@ mod tests { use super::*; use num; + use num::CheckedDiv; use mem; use u16; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 8f2f2190885..def8d8bb08e 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -81,13 +81,15 @@ pub fn getcwd() -> Path { #[cfg(windows)] pub mod win32 { + use libc::types::os::arch::extra::DWORD; use libc; - use vec; - use str; use option::{None, Option}; use option; use os::TMPBUF_SZ; - use libc::types::os::arch::extra::DWORD; + use str::StrSlice; + use str; + use vec::{MutableVector, ImmutableVector, OwnedVector}; + use vec; pub fn fill_utf16_buf_and_decode(f: |*mut u16, DWORD| -> DWORD) -> Option<~str> { diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 1eaff3f51a6..a8fd75c1bee 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -106,6 +106,9 @@ impl Rng for OSRng { unsafe { cast::transmute(v) } } fn fill_bytes(&mut self, v: &mut [u8]) { + use container::Container; + use vec::MutableVector; + extern { fn rust_win32_rand_gen(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: *mut BYTE); diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index a767af4cc0e..057e3f0b359 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -64,8 +64,10 @@ pub unsafe fn init(argc: int, argv: **u8) { realargs::init(argc, argv) } #[cfg(target_os = "freebsd")] mod imp { use cast; + use clone::Clone; #[cfg(not(test))] use libc; use option::{Option, Some, None}; + use ptr::RawPtr; use iter::Iterator; #[cfg(not(test))] use str; use unstable::finally::Finally; diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs index 0569fe32c58..24568fe13e5 100644 --- a/src/libstd/unstable/dynamic_lib.rs +++ b/src/libstd/unstable/dynamic_lib.rs @@ -199,11 +199,12 @@ pub mod dl { #[cfg(target_os = "win32")] pub mod dl { - use os; use libc; + use os; + use path::GenericPath; use path; use ptr; - use result::*; + use result::{Ok, Err, Result}; pub unsafe fn open_external(filename: &path::Path) -> *libc::c_void { os::win32::as_utf16_p(filename.as_str().unwrap(), |raw_name| { diff --git a/src/libstd/unstable/mutex.rs b/src/libstd/unstable/mutex.rs index 3f03486d426..4d12435e01a 100644 --- a/src/libstd/unstable/mutex.rs +++ b/src/libstd/unstable/mutex.rs @@ -249,6 +249,8 @@ mod imp { use libc; use libc::{HANDLE, BOOL, LPSECURITY_ATTRIBUTES, c_void, DWORD, LPCSTR}; use ptr; + use ptr::RawPtr; + type LPCRITICAL_SECTION = *c_void; static SPIN_COUNT: DWORD = 4000; diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index 1e8b79c8f35..1529fbae7e1 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -21,7 +21,6 @@ library. use ast::{enum_def, Ident, item, Generics, struct_def}; use ast::{MetaItem, MetaList, MetaNameValue, MetaWord}; use ext::base::ExtCtxt; -use ext::build::AstBuilder; use codemap::Span; pub mod clone; -- cgit 1.4.1-3-g733a5 From bcb1c381a38f8f36a71323bbf12d55afc8627d90 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 6 Jan 2014 22:33:37 -0800 Subject: stdtest: Fix all leaked trait imports --- src/libstd/ascii.rs | 2 +- src/libstd/bool.rs | 5 +---- src/libstd/c_str.rs | 7 +++---- src/libstd/gc.rs | 1 + src/libstd/io/buffered.rs | 3 ++- src/libstd/io/extensions.rs | 9 +++++---- src/libstd/io/net/addrinfo.rs | 2 +- src/libstd/io/net/ip.rs | 3 +-- src/libstd/io/net/udp.rs | 2 -- src/libstd/io/option.rs | 3 ++- src/libstd/io/util.rs | 1 + src/libstd/option.rs | 1 + src/libstd/os.rs | 4 +--- src/libstd/path/mod.rs | 1 + src/libstd/path/posix.rs | 5 ++--- src/libstd/path/windows.rs | 4 +--- src/libstd/rand/distributions/exponential.rs | 10 +++++----- src/libstd/rand/distributions/gamma.rs | 11 +++++------ src/libstd/rand/distributions/mod.rs | 2 +- src/libstd/rand/distributions/normal.rs | 10 +++++----- src/libstd/rand/distributions/range.rs | 5 ++--- src/libstd/rand/isaac.rs | 3 +-- src/libstd/rand/mod.rs | 6 ++---- src/libstd/rand/rand_impls.rs | 3 +-- src/libstd/rand/reader.rs | 2 ++ src/libstd/rand/reseeding.rs | 4 +--- src/libstd/rc.rs | 1 + src/libstd/result.rs | 3 +-- src/libstd/rt/unwind.rs | 14 ++++---------- src/libstd/run.rs | 5 ++--- src/libstd/send_str.rs | 8 +------- src/libstd/str.rs | 7 ++----- src/libstd/unstable/stack.rs | 2 -- src/libstd/util.rs | 5 +---- src/libstd/vec.rs | 10 ++++------ 35 files changed, 65 insertions(+), 99 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index adc10c456e3..c52ff2d088d 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -478,10 +478,10 @@ static ASCII_UPPER_MAP: &'static [u8] = &[ #[cfg(test)] mod tests { + use prelude::*; use super::*; use str::from_char; use char::from_u32; - use option::{Some, None}; macro_rules! v2ascii ( ( [$($e:expr),*]) => ( [$(Ascii{chr:$e}),*]); diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index 923aacf352b..a20ddc14147 100644 --- a/src/libstd/bool.rs +++ b/src/libstd/bool.rs @@ -317,10 +317,7 @@ impl Zero for bool { #[cfg(test)] mod tests { - use cmp::{Equal, Greater, Less, Eq, TotalOrd}; - use ops::{BitAnd, BitXor, BitOr}; - use from_str::{FromStr, from_str}; - use option::{Some, None}; + use prelude::*; use super::all_values; #[test] diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index a7e502be32e..b924378a0e7 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -377,10 +377,10 @@ pub unsafe fn from_c_multistring(buf: *libc::c_char, #[cfg(test)] mod tests { + use prelude::*; use super::*; use libc; use ptr; - use option::{Some, None}; #[test] fn test_str_multistring_parsing() { @@ -568,11 +568,10 @@ mod tests { #[cfg(test)] mod bench { - use iter::range; + use extra::test::BenchHarness; use libc; - use option::Some; + use prelude::*; use ptr; - use extra::test::BenchHarness; #[inline] fn check(s: &str, c_str: *libc::c_char) { diff --git a/src/libstd/gc.rs b/src/libstd/gc.rs index d3bec8ca6c9..df7111ca510 100644 --- a/src/libstd/gc.rs +++ b/src/libstd/gc.rs @@ -54,6 +54,7 @@ impl DeepClone for Gc { #[cfg(test)] mod tests { + use prelude::*; use super::*; use cell::RefCell; diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index fd8fd0c6814..fa85f286af7 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -318,9 +318,10 @@ impl Decorator for BufferedStream { #[cfg(test)] mod test { + use io::Decorator; + use io; use prelude::*; use super::*; - use io; use super::super::mem::{MemReader, MemWriter}; use Harness = extra::test::BenchHarness; diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs index 5fed9d74527..860ff644018 100644 --- a/src/libstd/io/extensions.rs +++ b/src/libstd/io/extensions.rs @@ -131,10 +131,11 @@ pub fn u64_from_be_bytes(data: &[u8], #[cfg(test)] mod test { - use option::{None, Option, Some}; + use unstable::finally::Finally; + use io::Decorator; + use prelude::*; use io::mem::{MemReader, MemWriter}; - use io::{Reader, io_error, placeholder_error}; - use vec::ImmutableVector; + use io::{io_error, placeholder_error}; struct InitialZeroByteReader { count: int, @@ -376,7 +377,7 @@ mod test { fn push_bytes_fail_reset_len() { // push_bytes unsafely sets the vector length. This is testing that // upon failure the length is reset correctly. - let mut reader = ErroringLaterReader { + let reader = ErroringLaterReader { count: 0, }; // FIXME (#7049): Figure out some other way to do this. diff --git a/src/libstd/io/net/addrinfo.rs b/src/libstd/io/net/addrinfo.rs index 6d968de209c..fe29a112262 100644 --- a/src/libstd/io/net/addrinfo.rs +++ b/src/libstd/io/net/addrinfo.rs @@ -100,8 +100,8 @@ fn lookup(hostname: Option<&str>, servname: Option<&str>, hint: Option) #[cfg(test)] mod test { - use option::Some; use io::net::ip::Ipv4Addr; + use prelude::*; use super::*; #[test] diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index 00f66f1e9c7..4fb631eb3d6 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -337,9 +337,8 @@ impl FromStr for SocketAddr { #[cfg(test)] mod test { + use prelude::*; use super::*; - use from_str::FromStr; - use option::{Option, Some, None}; #[test] fn test_from_str_ipv4() { diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 8994f6b461a..eaee48dc6e0 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -100,8 +100,6 @@ impl Writer for UdpStream { mod test { use super::*; use io::net::ip::{SocketAddr}; - use io::*; - use prelude::*; iotest!(fn bind_error() { let mut called = false; diff --git a/src/libstd/io/option.rs b/src/libstd/io/option.rs index a661d6ab7eb..60e63e95dcc 100644 --- a/src/libstd/io/option.rs +++ b/src/libstd/io/option.rs @@ -104,8 +104,9 @@ impl> Acceptor for Option { #[cfg(test)] mod test { - use option::*; + use prelude::*; use super::super::mem::*; + use io::Decorator; use super::super::{PreviousIoError, io_error}; #[test] diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index 48030543336..86538c37249 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -193,6 +193,7 @@ pub fn copy(r: &mut R, w: &mut W) { #[cfg(test)] mod test { + use io::Decorator; use io::mem::{MemReader, MemWriter}; use super::*; use prelude::*; diff --git a/src/libstd/option.rs b/src/libstd/option.rs index a44b280aa84..f49244a3607 100644 --- a/src/libstd/option.rs +++ b/src/libstd/option.rs @@ -457,6 +457,7 @@ pub fn collect>, V: FromIterator>(iter: Iter) -> #[cfg(test)] mod tests { use super::*; + use prelude::*; use iter::range; use str::StrSlice; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index def8d8bb08e..4042e13a592 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1239,16 +1239,14 @@ pub mod consts { #[cfg(test)] mod tests { + use prelude::*; use c_str::ToCStr; - use option::Some; use option; use os::{env, getcwd, getenv, make_absolute, args}; use os::{setenv, unsetenv}; use os; - use path::Path; use rand::Rng; use rand; - use str::StrSlice; #[test] diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 6488595ea4f..354cc10f022 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -687,6 +687,7 @@ fn from_utf8_with_replacement(mut v: &[u8]) -> ~str { } #[cfg(test)] mod tests { + use prelude::*; use super::{GenericPath, PosixPath, WindowsPath}; use c_str::ToCStr; diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index e0e3e8c790c..7b94de6c094 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -442,11 +442,9 @@ static dot_dot_static: &'static [u8] = bytes!(".."); #[cfg(test)] mod tests { + use prelude::*; use super::*; - use option::{Option, Some, None}; - use iter::Iterator; use str; - use vec::Vector; macro_rules! t( (s: $path:expr, $exp:expr) => ( @@ -1325,6 +1323,7 @@ mod tests { mod bench { use extra::test::BenchHarness; use super::*; + use prelude::*; #[bench] fn join_home_dir(bh: &mut BenchHarness) { diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index be83a519807..09b00be7e9d 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1053,11 +1053,9 @@ fn prefix_len(p: Option) -> uint { #[cfg(test)] mod tests { + use prelude::*; use super::*; use super::parse_prefix; - use option::{Some,None}; - use iter::Iterator; - use vec::Vector; macro_rules! t( (s: $path:expr, $exp:expr) => ( diff --git a/src/libstd/rand/distributions/exponential.rs b/src/libstd/rand/distributions/exponential.rs index fe1d8c505ca..336528eeb25 100644 --- a/src/libstd/rand/distributions/exponential.rs +++ b/src/libstd/rand/distributions/exponential.rs @@ -91,10 +91,10 @@ impl IndependentSample for Exp { #[cfg(test)] mod test { + use rand::distributions::*; + use prelude::*; use rand::*; use super::*; - use iter::range; - use option::{Some, None}; #[test] fn test_exp() { @@ -120,11 +120,11 @@ mod test { #[cfg(test)] mod bench { use extra::test::BenchHarness; + use mem::size_of; + use prelude::*; use rand::{XorShiftRng, RAND_BENCH_N}; use super::*; - use iter::range; - use option::{Some, None}; - use mem::size_of; + use rand::distributions::*; #[bench] fn rand_exp(bh: &mut BenchHarness) { diff --git a/src/libstd/rand/distributions/gamma.rs b/src/libstd/rand/distributions/gamma.rs index 78b6f5b8c7f..96efa948015 100644 --- a/src/libstd/rand/distributions/gamma.rs +++ b/src/libstd/rand/distributions/gamma.rs @@ -310,10 +310,10 @@ impl IndependentSample for StudentT { #[cfg(test)] mod test { + use rand::distributions::*; + use prelude::*; use rand::*; use super::*; - use iter::range; - use option::{Some, None}; #[test] fn test_chi_squared_one() { @@ -371,13 +371,12 @@ mod test { #[cfg(test)] mod bench { - use super::*; + use extra::test::BenchHarness; use mem::size_of; + use prelude::*; use rand::distributions::IndependentSample; use rand::{StdRng, RAND_BENCH_N}; - use extra::test::BenchHarness; - use iter::range; - use option::{Some, None}; + use super::*; #[bench] diff --git a/src/libstd/rand/distributions/mod.rs b/src/libstd/rand/distributions/mod.rs index e29a70aede9..a996233abe3 100644 --- a/src/libstd/rand/distributions/mod.rs +++ b/src/libstd/rand/distributions/mod.rs @@ -253,9 +253,9 @@ fn ziggurat( #[cfg(test)] mod tests { + use prelude::*; use rand::*; use super::*; - use option::{Some, None}; #[deriving(Eq)] struct ConstRand(uint); diff --git a/src/libstd/rand/distributions/normal.rs b/src/libstd/rand/distributions/normal.rs index 7b24f78bdcf..7a15091df9d 100644 --- a/src/libstd/rand/distributions/normal.rs +++ b/src/libstd/rand/distributions/normal.rs @@ -148,10 +148,10 @@ impl IndependentSample for LogNormal { #[cfg(test)] mod tests { + use prelude::*; use rand::*; use super::*; - use iter::range; - use option::{Some, None}; + use rand::distributions::*; #[test] fn test_normal() { @@ -188,11 +188,11 @@ mod tests { #[cfg(test)] mod bench { use extra::test::BenchHarness; + use mem::size_of; + use prelude::*; use rand::{XorShiftRng, RAND_BENCH_N}; + use rand::distributions::*; use super::*; - use iter::range; - use option::{Some, None}; - use mem::size_of; #[bench] fn rand_normal(bh: &mut BenchHarness) { diff --git a/src/libstd/rand/distributions/range.rs b/src/libstd/rand/distributions/range.rs index fc6cdde162d..8141b3d3e89 100644 --- a/src/libstd/rand/distributions/range.rs +++ b/src/libstd/rand/distributions/range.rs @@ -163,12 +163,11 @@ float_impl! { f64 } #[cfg(test)] mod tests { + use prelude::*; use super::*; use rand::*; + use rand::distributions::*; use num::Bounded; - use iter::range; - use option::{Some, None}; - use vec::ImmutableVector; #[should_fail] #[test] diff --git a/src/libstd/rand/isaac.rs b/src/libstd/rand/isaac.rs index e1845bfeab6..6fd2cde9dfb 100644 --- a/src/libstd/rand/isaac.rs +++ b/src/libstd/rand/isaac.rs @@ -433,8 +433,7 @@ impl<'a> SeedableRng<&'a [u64]> for Isaac64Rng { mod test { use super::*; use rand::{Rng, SeedableRng, OSRng}; - use option::Some; - use iter::range; + use prelude::*; use vec; #[test] diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 0fa436b2447..e52a3850011 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -656,8 +656,7 @@ pub struct Closed01(F); #[cfg(test)] mod test { - use iter::{Iterator, range}; - use option::{Option, Some}; + use prelude::*; use vec; use super::*; @@ -845,11 +844,10 @@ static RAND_BENCH_N: u64 = 100; #[cfg(test)] mod bench { + use prelude::*; use extra::test::BenchHarness; use rand::{XorShiftRng, StdRng, IsaacRng, Isaac64Rng, Rng, RAND_BENCH_N}; use mem::size_of; - use iter::range; - use option::{Some, None}; #[bench] fn rand_xorshift(bh: &mut BenchHarness) { diff --git a/src/libstd/rand/rand_impls.rs b/src/libstd/rand/rand_impls.rs index dd6edca94ac..1c90ef148fc 100644 --- a/src/libstd/rand/rand_impls.rs +++ b/src/libstd/rand/rand_impls.rs @@ -226,9 +226,8 @@ impl Rand for @T { #[cfg(test)] mod tests { + use prelude::*; use rand::{Rng, task_rng, Open01, Closed01}; - use iter::range; - use option::{None, Some}; struct ConstantRng(u64); impl Rng for ConstantRng { diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs index 7045b64eff6..7af98e418a8 100644 --- a/src/libstd/rand/reader.rs +++ b/src/libstd/rand/reader.rs @@ -78,6 +78,8 @@ mod test { use super::*; use io::mem::MemReader; use cast; + use rand::*; + use prelude::*; #[test] fn test_reader_rng_u64() { diff --git a/src/libstd/rand/reseeding.rs b/src/libstd/rand/reseeding.rs index 9e049564a2d..c0a7d14bf70 100644 --- a/src/libstd/rand/reseeding.rs +++ b/src/libstd/rand/reseeding.rs @@ -142,11 +142,9 @@ impl Default for ReseedWithDefault { #[cfg(test)] mod test { + use prelude::*; use super::*; use rand::{SeedableRng, Rng}; - use default::Default; - use iter::range; - use option::{None, Some}; struct Counter { i: u32 diff --git a/src/libstd/rc.rs b/src/libstd/rc.rs index 9158e8cdb89..ad2305c2410 100644 --- a/src/libstd/rc.rs +++ b/src/libstd/rc.rs @@ -170,6 +170,7 @@ impl Drop for Rc { #[cfg(test)] mod test_rc { + use prelude::*; use super::*; use cell::RefCell; diff --git a/src/libstd/result.rs b/src/libstd/result.rs index 4e8db15a92e..1a4e6d5bcfd 100644 --- a/src/libstd/result.rs +++ b/src/libstd/result.rs @@ -293,10 +293,9 @@ pub fn fold_>>(iterator: Iter) -> Result<(),E> { #[cfg(test)] mod tests { use super::*; + use prelude::*; use iter::range; - use to_str::ToStr; - use vec::ImmutableVector; pub fn op1() -> Result { Ok(666) } pub fn op2() -> Result { Err(~"sadface") } diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 56dc2288a40..3a07e8c373b 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -77,6 +77,7 @@ mod libunwind { //! Unwind library interface #[allow(non_camel_case_types)]; + #[allow(dead_code)] // these are just bindings use libc::{uintptr_t, uint64_t}; @@ -262,7 +263,8 @@ fn rust_exception_class() -> uw::_Unwind_Exception_Class { // This is achieved by overriding the return value in search phase to always // say "catch!". -#[cfg(not(target_arch = "arm"))] +#[cfg(not(target_arch = "arm"), not(test))] +#[doc(hidden)] pub mod eabi { use uw = super::libunwind; use libc::c_int; @@ -278,8 +280,6 @@ pub mod eabi { #[lang="eh_personality"] #[no_mangle] // so we can reference it by name from middle/trans/base.rs - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality( version: c_int, actions: uw::_Unwind_Action, @@ -295,8 +295,6 @@ pub mod eabi { } #[no_mangle] // referenced from rust_try.ll - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality_catch( version: c_int, actions: uw::_Unwind_Action, @@ -319,7 +317,7 @@ pub mod eabi { // ARM EHABI uses a slightly different personality routine signature, // but otherwise works the same. -#[cfg(target_arch = "arm")] +#[cfg(target_arch = "arm", not(test))] pub mod eabi { use uw = super::libunwind; use libc::c_int; @@ -333,8 +331,6 @@ pub mod eabi { #[lang="eh_personality"] #[no_mangle] // so we can reference it by name from middle/trans/base.rs - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality( state: uw::_Unwind_State, ue_header: *uw::_Unwind_Exception, @@ -347,8 +343,6 @@ pub mod eabi { } #[no_mangle] // referenced from rust_try.ll - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality_catch( state: uw::_Unwind_State, ue_header: *uw::_Unwind_Exception, diff --git a/src/libstd/run.rs b/src/libstd/run.rs index 337cb744080..3595a7d45ac 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -330,16 +330,15 @@ pub fn process_output(prog: &str, args: &[~str]) -> Option { #[cfg(test)] mod tests { + use prelude::*; use libc::c_int; - use option::{Option, None, Some}; use os; - use path::Path; use run; use str; use task::spawn; use unstable::running_on_valgrind; use io::pipe::PipeStream; - use io::{Writer, Reader, io_error, FileNotFound}; + use io::{io_error, FileNotFound}; #[test] #[cfg(not(target_os="android"))] // FIXME(#10380) diff --git a/src/libstd/send_str.rs b/src/libstd/send_str.rs index f10818b052d..c8143442d6e 100644 --- a/src/libstd/send_str.rs +++ b/src/libstd/send_str.rs @@ -176,14 +176,8 @@ impl IterBytes for SendStr { #[cfg(test)] mod tests { - use clone::{Clone, DeepClone}; - use cmp::{TotalEq, Ord, TotalOrd, Equiv}; - use cmp::Equal; - use container::Container; - use default::Default; + use prelude::*; use send_str::{SendStrOwned, SendStrStatic}; - use str::Str; - use to_str::ToStr; #[test] fn test_send_str_traits() { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index a005549402e..35e188964c1 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -2768,14 +2768,11 @@ impl Default for @str { #[cfg(test)] mod tests { - use container::Container; - use option::{None, Some, Option}; + use iter::AdditiveIterator; + use prelude::*; use ptr; use str::*; - use vec::{Vector, ImmutableVector, CopyableVector}; - use cmp::{TotalOrd, Less, Equal, Greater}; use send_str::{SendStrOwned, SendStrStatic}; - use from_str::from_str; #[test] fn test_eq() { diff --git a/src/libstd/unstable/stack.rs b/src/libstd/unstable/stack.rs index 5b5eaf9d8d0..d6cd690eaa9 100644 --- a/src/libstd/unstable/stack.rs +++ b/src/libstd/unstable/stack.rs @@ -24,8 +24,6 @@ //! detection is not guaranteed to continue in the future. Usage of this module //! is discouraged unless absolutely necessary. -use str::Str; - static RED_ZONE: uint = 20 * 1024; /// This function is invoked from rust's current __morestack function. Segmented diff --git a/src/libstd/util.rs b/src/libstd/util.rs index 6c0424b50e1..06c7923bfed 100644 --- a/src/libstd/util.rs +++ b/src/libstd/util.rs @@ -78,10 +78,7 @@ impl Void { #[cfg(test)] mod tests { use super::*; - - use clone::Clone; - use ops::Drop; - use option::{None, Some}; + use prelude::*; use mem::size_of; #[test] diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 4fa2372c1ab..632490d62ad 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -2970,10 +2970,10 @@ impl Extendable for ~[A] { #[cfg(test)] mod tests { + use prelude::*; use mem; use vec::*; use cmp::*; - use prelude::*; use rand::{Rng, task_rng}; fn square(n: uint) -> uint { n * n } @@ -4454,13 +4454,11 @@ mod tests { #[cfg(test)] mod bench { use extra::test::BenchHarness; - use iter::range; - use vec; - use vec::{VectorVector, MutableTotalOrdVector}; - use option::*; + use mem; + use prelude::*; use ptr; use rand::{weak_rng, Rng}; - use mem; + use vec; #[bench] fn iterator(bh: &mut BenchHarness) { -- cgit 1.4.1-3-g733a5 From 0547fb9cad4053f3ec66e722b7a05df259d63038 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 7 Jan 2014 00:57:12 -0800 Subject: Fixup the rest of the tests in the compiler --- src/librustc/driver/driver.rs | 1 + src/librustc/util/sha2.rs | 4 ++-- src/librustpkg/tests.rs | 1 + src/librustuv/async.rs | 2 +- src/libstd/rt/args.rs | 2 +- src/libstd/rt/logging.rs | 1 - src/libsyntax/ext/expand.rs | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 0fccf50e009..7f56fcf8e71 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -1131,6 +1131,7 @@ mod test { use extra::getopts::groups::getopts; use syntax::attr; + use syntax::attr::AttrMetaMethods; use syntax::diagnostic; // When the user supplies --test we should implicitly supply --cfg test diff --git a/src/librustc/util/sha2.rs b/src/librustc/util/sha2.rs index b3c4fbf1105..73d39d8145f 100644 --- a/src/librustc/util/sha2.rs +++ b/src/librustc/util/sha2.rs @@ -522,7 +522,7 @@ static H256: [u32, ..8] = [ #[cfg(test)] mod tests { - use super::{Digest, Sha256}; + use super::{Digest, Sha256, FixedBuffer}; use std::vec; use std::rand::isaac::IsaacRng; use std::rand::Rng; @@ -633,7 +633,7 @@ mod tests { #[cfg(test)] mod bench { use extra::test::BenchHarness; - use super::Sha256; + use super::{Sha256, FixedBuffer, Digest}; #[bench] pub fn sha256_10(bh: &mut BenchHarness) { diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs index 2c0946f49ec..7d39be913b4 100644 --- a/src/librustpkg/tests.rs +++ b/src/librustpkg/tests.rs @@ -10,6 +10,7 @@ // rustpkg unit tests +use CtxMethods; use context::{BuildContext, Context, RustcFlags}; use std::{os, run, str, task}; use std::io; diff --git a/src/librustuv/async.rs b/src/librustuv/async.rs index d9589788c4d..5085dd64b67 100644 --- a/src/librustuv/async.rs +++ b/src/librustuv/async.rs @@ -125,7 +125,7 @@ impl Drop for AsyncWatcher { #[cfg(test)] mod test_remote { - use std::rt::rtio::Callback; + use std::rt::rtio::{Callback, RemoteCallback}; use std::rt::thread::Thread; use super::AsyncWatcher; diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index 057e3f0b359..526ad60bb21 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -140,7 +140,7 @@ mod imp { #[cfg(test)] mod tests { - use option::{Some, None}; + use prelude::*; use super::*; use unstable::finally::Finally; diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index 2004dac0c7c..b86a9612d70 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -9,7 +9,6 @@ // except according to those terms. use container::Container; -use fmt; use from_str::from_str; use iter::Iterator; use libc::exit; diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index ccffb11f73e..fb98f766fef 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1109,6 +1109,7 @@ mod test { use codemap; use codemap::Spanned; use fold; + use fold::*; use parse; use parse::token::{fresh_mark, gensym, intern, ident_to_str}; use parse::token; -- cgit 1.4.1-3-g733a5