From 813886b22ccd0976db03c1bfcbb9738b5b7c41db Mon Sep 17 00:00:00 2001 From: chromatic Date: Sun, 2 Feb 2014 16:32:52 -0800 Subject: [PATCH] Removed prelude::* from libstd files. This replaces the imports from the prelude with the re-exported symbols. --- src/libstd/ascii.rs | 4 ++-- src/libstd/cell.rs | 5 ++++- src/libstd/local_data.rs | 4 +++- src/libstd/os.rs | 22 ++++++++++++++++++---- src/libstd/reference.rs | 2 +- src/libstd/run.rs | 8 +++++++- src/libstd/trie.rs | 6 +++++- src/libstd/unit.rs | 3 ++- src/libstd/vec_ng.rs | 8 ++++++-- 9 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 83aec9d0aa6..4a43a00c5f5 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -18,9 +18,9 @@ use container::Container; use cast; use iter::Iterator; -use vec::{ImmutableVector, MutableVector, Vector}; +use vec::{ImmutableVector,MutableVector,Vector}; use to_bytes::IterBytes; -use option::{Option, Some, None}; +use option::{Option,Some,None}; /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. #[deriving(Clone, Eq, Ord, TotalOrd, TotalEq)] diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs index e19b8ae712f..6fab74cbc2f 100644 --- a/src/libstd/cell.rs +++ b/src/libstd/cell.rs @@ -10,7 +10,10 @@ //! Types dealing with dynamic mutability -use prelude::*; +use clone::{Clone,DeepClone}; +use cmp::Eq; +use ops::Drop; +use option::{None,Option,Some}; use cast; use kinds::{marker, Pod}; diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index 719cf2450c5..5c3ca07f128 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -41,7 +41,9 @@ // magic. use cast; -use prelude::*; +use option::{None,Option,Some}; +use vec::{ImmutableVector,MutableVector,OwnedVector}; +use iter::{Iterator}; use rt::task::{Task, LocalStorage}; use util::replace; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 541db01f148..fb67f82d612 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -28,20 +28,31 @@ #[allow(missing_doc)]; -use clone::Clone; -use container::Container; #[cfg(target_os = "macos")] +#[cfg(windows)] use iter::range; + +use clone::Clone; +use container::Container; use libc; use libc::{c_char, c_void, c_int}; -use option::{Some, None}; +use option::{Some, None, Option}; use os; -use prelude::*; +use ops::Drop; +use result::{Err, Ok, Result}; use ptr; use str; +use str::{Str, StrSlice}; use fmt; use unstable::finally::Finally; use sync::atomics::{AtomicInt, INIT_ATOMIC_INT, SeqCst}; +use path::{Path, GenericPath}; +use iter::Iterator; +use vec::{Vector, CloneableVector, ImmutableVector, MutableVector, OwnedVector}; +use ptr::RawPtr; + +#[cfg(unix)] +use c_str::ToCStr; /// Delegates to the libc close() function, returning the same return value. pub fn close(fd: int) -> int { @@ -396,6 +407,8 @@ fn load_self() -> Option<~[u8]> { #[cfg(windows)] fn load_self() -> Option<~[u8]> { + use str::OwnedStr; + unsafe { use os::win32::fill_utf16_buf_and_decode; fill_utf16_buf_and_decode(|buf, sz| { @@ -967,6 +980,7 @@ impl MemoryMap { /// `ErrZeroLength`. pub fn new(min_len: uint, options: &[MapOption]) -> Result { use libc::off_t; + use cmp::Equiv; if min_len == 0 { return Err(ErrZeroLength) diff --git a/src/libstd/reference.rs b/src/libstd/reference.rs index 91f03f02892..7584d07ed64 100644 --- a/src/libstd/reference.rs +++ b/src/libstd/reference.rs @@ -11,7 +11,7 @@ //! Utilities for references #[cfg(not(test))] -use prelude::*; +use cmp::{Eq,Ord,Ordering,TotalEq,TotalOrd}; // Equality for region pointers #[cfg(not(test))] diff --git a/src/libstd/run.rs b/src/libstd/run.rs index 04e42b3eedf..1b880bc43ee 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -20,7 +20,13 @@ use io; use libc::{pid_t, c_int}; use libc; -use prelude::*; +use option::{None,Option,Some}; +use task::spawn; +use path::{Path,GenericPath}; +use result::Ok; +use str::Str; +use vec::Vector; +use clone::Clone; /** * A value representing a child process. diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs index ef0930fabf1..7530c5e338a 100644 --- a/src/libstd/trie.rs +++ b/src/libstd/trie.rs @@ -10,12 +10,16 @@ //! Ordered containers with integer keys, implemented as radix tries (`TrieSet` and `TrieMap` types) -use prelude::*; +use option::{None,Option,Some}; +use container::{Container,Map,Mutable,MutableMap}; +use iter::{Extendable,FromIterator,Iterator}; use mem; use uint; use util::replace; use unstable::intrinsics::init; use vec; +use ptr::RawPtr; +use vec::{ImmutableVector,Items,MutableVector,MutItems,OwnedVector}; // FIXME: #5244: need to manually update the TrieNode constructor static SHIFT: uint = 4; diff --git a/src/libstd/unit.rs b/src/libstd/unit.rs index 786a7f42bb3..d62fcca63a4 100644 --- a/src/libstd/unit.rs +++ b/src/libstd/unit.rs @@ -11,7 +11,8 @@ //! Functions for the unit type. #[cfg(not(test))] -use prelude::*; +use default::Default; +use cmp::{Eq,Equal,Ord,Ordering,TotalEq,TotalOrd}; #[cfg(not(test))] impl Eq for () { diff --git a/src/libstd/vec_ng.rs b/src/libstd/vec_ng.rs index e503497d95d..c49a7302e72 100644 --- a/src/libstd/vec_ng.rs +++ b/src/libstd/vec_ng.rs @@ -11,12 +11,16 @@ // Migrate documentation over from `std::vec` when it is removed. #[doc(hidden)]; -use prelude::*; +use ops::Drop; +use option::{None, Option, Some}; +use clone::Clone; +use iter::{DoubleEndedIterator, Iterator}; +use num::CheckedMul; use container::Container; use mem::size_of; use cast::{forget, transmute}; use rt::global_heap::{malloc_raw, realloc_raw}; -use vec::Items; +use vec::{ImmutableVector, Items, MutableVector}; use unstable::raw::Slice; use ptr::{offset, read_ptr}; use libc::{free, c_void}; -- GitLab