Skip to content

Commit 0655eda

Browse files
committed
std: Fill in all missing imports
Fallout from the previous commits
1 parent f117549 commit 0655eda

29 files changed

+65
-24
lines changed

src/libstd/at_vec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ pub mod raw {
169169
use at_vec::capacity;
170170
use cast;
171171
use cast::{transmute, transmute_copy};
172+
use container::Container;
172173
use option::None;
173174
use ptr;
174175
use mem;

src/libstd/comm/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ use rt::local::Local;
238238
use rt::task::{Task, BlockedTask};
239239
use rt::thread::Thread;
240240
use sync::atomics::{AtomicInt, AtomicBool, SeqCst, Relaxed};
241-
use vec::{ImmutableVector, OwnedVector};
241+
use vec::OwnedVector;
242242

243243
use spsc = sync::spsc_queue;
244244
use mpsc = sync::mpsc_queue;

src/libstd/io/extensions.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use iter::Iterator;
1717
use option::Option;
1818
use io::Reader;
19+
use vec::OwnedVector;
1920

2021
/// An iterator that reads a single byte on each iteration,
2122
/// until `.read_byte()` returns `None`.

src/libstd/io/net/ip.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010

1111
use container::Container;
1212
use from_str::FromStr;
13+
use iter::Iterator;
1314
use option::{Option, None, Some};
15+
use str::StrSlice;
1416
use to_str::ToStr;
15-
use vec::{MutableCloneableVector, ImmutableVector};
17+
use vec::{MutableCloneableVector, ImmutableVector, MutableVector};
1618

1719
pub type Port = u16;
1820

src/libstd/io/stdio.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ out.write(bytes!("Hello, world!"));
2626
2727
*/
2828

29+
use container::Container;
2930
use fmt;
3031
use io::buffered::LineBufferedWriter;
3132
use io::{Reader, Writer, io_error, IoError, OtherIoError,
@@ -37,7 +38,9 @@ use result::{Ok, Err};
3738
use rt::local::Local;
3839
use rt::rtio::{DontClose, IoFactory, LocalIo, RtioFileStream, RtioTTY};
3940
use rt::task::Task;
41+
use str::StrSlice;
4042
use util;
43+
use vec::ImmutableVector;
4144

4245
// And so begins the tale of acquiring a uv handle to a stdio stream on all
4346
// platforms in all situations. Our story begins by splitting the world into two

src/libstd/num/strconv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use str;
2121
use vec::{CopyableVector, ImmutableVector, MutableVector};
2222
use vec::OwnedVector;
2323
use num::{NumCast, Zero, One, cast, pow_with_uint, Integer};
24-
use num::{Round, Float, FPNaN, FPInfinite};
24+
use num::{Round, Float, FPNaN, FPInfinite, ToPrimitive};
2525

2626
pub enum ExponentFormat {
2727
ExpNone,

src/libstd/path/posix.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ use str;
2121
use str::Str;
2222
use to_bytes::IterBytes;
2323
use vec;
24-
use vec::{CopyableVector, RSplitIterator, SplitIterator, Vector, VectorVector};
24+
use vec::{CopyableVector, RSplitIterator, SplitIterator, Vector, VectorVector,
25+
ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector};
2526
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
2627

2728
/// Iterator that yields successive components of a Path as &[u8]

src/libstd/path/windows.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
use ascii::AsciiCast;
1414
use c_str::{CString, ToCStr};
1515
use cast;
16+
use clone::Clone;
17+
use container::Container;
1618
use cmp::Eq;
1719
use from_str::FromStr;
1820
use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Invert, Iterator, Map};
1921
use option::{Option, Some, None};
2022
use str;
21-
use str::{CharSplitIterator, OwnedStr, Str, StrVector};
23+
use str::{CharSplitIterator, OwnedStr, Str, StrVector, StrSlice};
2224
use to_bytes::IterBytes;
23-
use vec::Vector;
25+
use vec::{Vector, OwnedVector, ImmutableVector};
2426
use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe};
2527

2628
/// Iterator that yields successive components of a Path as &str

src/libstd/rand/distributions/exponential.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
//! The exponential distribution.
1212
13+
use num::Exponential;
1314
use rand::{Rng, Rand};
1415
use rand::distributions::{ziggurat, ziggurat_tables, Sample, IndependentSample};
1516

src/libstd/rand/distributions/gamma.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010

1111
//! The Gamma and derived distributions.
1212
13+
use num::Algebraic;
14+
use num;
1315
use rand::{Rng, Open01};
14-
use super::{IndependentSample, Sample, Exp};
1516
use super::normal::StandardNormal;
16-
use num;
17+
use super::{IndependentSample, Sample, Exp};
1718

1819
/// The Gamma distribution `Gamma(shape, scale)` distribution.
1920
///

src/libstd/rand/distributions/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ that do not need to record state.
2020
2121
*/
2222

23-
use iter::range;
23+
use container::Container;
24+
use iter::{range, Iterator};
2425
use option::{Some, None};
2526
use num;
27+
use num::CheckedAdd;
2628
use rand::{Rng, Rand};
2729
use clone::Clone;
30+
use vec::MutableVector;
2831

2932
pub use self::range::Range;
3033
pub use self::gamma::{Gamma, ChiSquared, FisherF, StudentT};

src/libstd/rand/distributions/normal.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
//! The normal and derived distributions.
1212
13+
use num::Exponential;
1314
use rand::{Rng, Rand, Open01};
1415
use rand::distributions::{ziggurat, ziggurat_tables, Sample, IndependentSample};
1516

src/libstd/rand/isaac.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
1313
use rand::{Rng, SeedableRng, OSRng};
1414
use iter::{Iterator, range, range_step, Repeat};
15+
use num::Times;
1516
use option::{None, Some};
16-
use vec::raw;
17+
use vec::{raw, MutableVector, ImmutableVector};
1718
use mem;
1819

1920
static RAND_SIZE_LEN: u32 = 8;

src/libstd/rand/reader.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
//! A wrapper around any Reader to treat it as an RNG.
1212
13+
use container::Container;
1314
use option::{Some, None};
1415
use io::Reader;
1516

src/libstd/rand/reseeding.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
//! A wrapper around another RNG that reseeds it after it
1212
//! generates a certain number of random bytes.
1313
14-
use rand::{Rng, SeedableRng};
14+
use container::Container;
1515
use default::Default;
16+
use rand::{Rng, SeedableRng};
1617

1718
/// How many bytes of entropy the underling RNG is allowed to generate
1819
/// before it is reseeded.

src/libstd/rt/borrowck.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// except according to those terms.
1010

1111
use c_str::{ToCStr, CString};
12+
use container::Container;
13+
use iter::Iterator;
1214
use libc::{c_char, size_t};
1315
use option::{Option, None, Some};
1416
use ptr::RawPtr;
@@ -19,7 +21,7 @@ use str::OwnedStr;
1921
use str;
2022
use uint;
2123
use unstable::raw;
22-
use vec::ImmutableVector;
24+
use vec::{ImmutableVector, OwnedVector};
2325

2426
pub static FROZEN_BIT: uint = 1 << (uint::bits - 1);
2527
pub static MUT_BIT: uint = 1 << (uint::bits - 2);

src/libstd/rt/crate_map.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
use container::MutableSet;
1212
use hashmap::HashSet;
13+
use iter::Iterator;
1314
use option::{Some, None, Option};
15+
use ptr::RawPtr;
1416
use vec::ImmutableVector;
1517
use rt::rtio::EventLoop;
1618

src/libstd/rt/global_heap.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
use libc::{c_void, c_char, size_t, uintptr_t, free, malloc, realloc};
12+
use ptr::RawPtr;
1213
use unstable::intrinsics::TyDesc;
1314
use unstable::raw;
1415
use mem::size_of;

src/libstd/rt/local_heap.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@
1111
//! The local, garbage collected heap
1212
1313
use cast;
14+
use iter::Iterator;
1415
use libc::{c_void, uintptr_t};
1516
use libc;
1617
use mem;
1718
use ops::Drop;
1819
use option::{Option, None, Some};
1920
use ptr;
21+
use ptr::RawPtr;
2022
use rt::env;
2123
use rt::global_heap;
2224
use rt::local::Local;
2325
use rt::task::Task;
2426
use unstable::intrinsics::TyDesc;
2527
use unstable::raw;
28+
use vec::ImmutableVector;
2629

2730
// This has no meaning with out rtdebug also turned on.
2831
#[cfg(rtdebug)]

src/libstd/rt/local_ptr.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
use cast;
2121
use ops::Drop;
22+
use ptr::RawPtr;
2223

2324
#[cfg(windows)] // mingw-w32 doesn't like thread_local things
2425
#[cfg(target_os = "android")] // see #10686
@@ -79,6 +80,7 @@ pub unsafe fn borrow<T>() -> Borrowed<T> {
7980
pub mod compiled {
8081
use cast;
8182
use option::{Option, Some, None};
83+
use ptr::RawPtr;
8284
#[cfg(not(test))] use libc::c_void;
8385

8486
#[cfg(test)]
@@ -177,6 +179,7 @@ pub mod native {
177179
use libc::c_void;
178180
use option::{Option, Some, None};
179181
use ptr;
182+
use ptr::RawPtr;
180183
use tls = rt::thread_local_storage;
181184

182185
static mut RT_TLS_KEY: tls::Key = -1;

src/libstd/rt/logging.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use container::Container;
12+
use fmt;
1113
use from_str::from_str;
14+
use iter::Iterator;
1215
use libc::exit;
1316
use option::{Some, None, Option};
1417
use rt::crate_map::{ModEntry, CrateMap, iter_crate_map, get_crate_map};
1518
use str::StrSlice;
16-
use vec::{ImmutableVector, MutableTotalOrdVector};
19+
use vec::{ImmutableVector, MutableTotalOrdVector, OwnedVector};
1720
#[cfg(test)] use cast::transmute;
1821

1922
struct LogDirective {

src/libstd/rt/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@ Several modules in `core` are clients of `rt`:
5858
#[allow(missing_doc)];
5959

6060
use any::Any;
61-
use clone::Clone;
62-
use container::Container;
63-
use iter::Iterator;
6461
use option::Option;
65-
use ptr::RawPtr;
6662
use result::Result;
6763
use task::TaskOpts;
68-
use vec::{OwnedVector, MutableVector, ImmutableVector};
6964

7065
use self::task::{Task, BlockedTask};
7166

src/libstd/rt/task.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use any::AnyOwnExt;
1717
use borrow;
1818
use cast;
1919
use cleanup;
20+
use clone::Clone;
2021
use io::Writer;
2122
use iter::{Iterator, Take};
2223
use local_data;

src/libstd/rt/unwind.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ use kinds::Send;
6262
use libc::{c_void, c_char, size_t};
6363
use option::{Some, None, Option};
6464
use prelude::drop;
65+
use ptr::RawPtr;
6566
use result::{Err, Ok};
6667
use rt::local::Local;
6768
use rt::task::Task;

src/libstd/rt/util.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
use container::Container;
1212
use fmt;
1313
use from_str::FromStr;
14+
use iter::Iterator;
1415
use libc;
1516
use option::{Some, None, Option};
1617
use os;
1718
use str::StrSlice;
1819
use unstable::running_on_valgrind;
20+
use vec::ImmutableVector;
1921

2022
// Indicates whether we should perform expensive sanity checks, including rtassert!
2123
// XXX: Once the runtime matures remove the `true` below to turn off rtassert, etc.

src/libstd/str.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -977,11 +977,13 @@ static TAG_CONT_U8: u8 = 128u8;
977977
/// Unsafe operations
978978
pub mod raw {
979979
use cast;
980+
use container::Container;
980981
use libc;
981982
use ptr;
982-
use str::{is_utf8, OwnedStr};
983+
use ptr::RawPtr;
984+
use str::{is_utf8, OwnedStr, StrSlice};
983985
use vec;
984-
use vec::MutableVector;
986+
use vec::{MutableVector, ImmutableVector, OwnedVector};
985987
use unstable::raw::Slice;
986988

987989
/// Create a Rust string from a *u8 buffer of the given length
@@ -1137,10 +1139,12 @@ Section: Trait implementations
11371139
#[cfg(not(test))]
11381140
#[allow(missing_doc)]
11391141
pub mod traits {
1140-
use ops::Add;
1142+
use container::Container;
11411143
use cmp::{TotalOrd, Ordering, Less, Equal, Greater, Eq, Ord, Equiv, TotalEq};
1142-
use super::{Str, eq_slice};
1144+
use iter::Iterator;
1145+
use ops::Add;
11431146
use option::{Some, None};
1147+
use str::{Str, StrSlice, OwnedStr, eq_slice};
11441148
11451149
impl<'a> Add<&'a str,~str> for &'a str {
11461150
#[inline]

src/libstd/unstable/mutex.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ mod imp {
167167
use libc::c_void;
168168
use libc;
169169
use ptr;
170+
use ptr::RawPtr;
170171

171172
type pthread_mutex_t = libc::c_void;
172173
type pthread_mutexattr_t = libc::c_void;

src/libstd/unstable/stack.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
//! detection is not guaranteed to continue in the future. Usage of this module
2525
//! is discouraged unless absolutely necessary.
2626
27+
use str::Str;
28+
2729
static RED_ZONE: uint = 20 * 1024;
2830

2931
/// This function is invoked from rust's current __morestack function. Segmented

src/libstd/vec.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ impl<'a, T> RandomAccessIterator<&'a [T]> for ChunkIter<'a, T> {
611611
pub mod traits {
612612
use super::*;
613613

614+
use container::Container;
614615
use clone::Clone;
615616
use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Equiv};
616617
use iter::order;
@@ -2520,7 +2521,7 @@ pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] {
25202521
pub mod raw {
25212522
use cast;
25222523
use ptr;
2523-
use vec::{with_capacity, MutableVector};
2524+
use vec::{with_capacity, MutableVector, OwnedVector};
25242525
use unstable::raw::Slice;
25252526

25262527
/**
@@ -2599,8 +2600,9 @@ pub mod raw {
25992600
/// Operations on `[u8]`.
26002601
pub mod bytes {
26012602
use container::Container;
2602-
use vec::MutableVector;
2603+
use vec::{MutableVector, OwnedVector, ImmutableVector};
26032604
use ptr;
2605+
use ptr::RawPtr;
26042606

26052607
/// A trait for operations on mutable `[u8]`s.
26062608
pub trait MutableByteVector {

0 commit comments

Comments
 (0)