diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-11-06 13:54:32 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-11-06 14:18:07 -0800 |
| commit | 65805bffe7524a79de6e275d6d9172f6e5ff99eb (patch) | |
| tree | 94647d755c3a5b088ddd19b2e1dfb04c5fdccdb5 /src/libstd | |
| parent | 03006c7300536ee290fd5659edc59f6119daa5ab (diff) | |
| download | rust-65805bffe7524a79de6e275d6d9172f6e5ff99eb.tar.gz rust-65805bffe7524a79de6e275d6d9172f6e5ff99eb.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rand/os.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index e648a618516..6bf259d201e 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -22,7 +22,7 @@ mod imp { use rand::Rng; use rand::reader::ReaderRng; use result::{Ok, Err}; - use slice::{ImmutableSlice, MutableSlice}; + use slice::SlicePrelude; use mem; use os::errno; |