diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:24:56 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 10:50:13 -0800 |
| commit | e921e3f04513ffb094208a538a2835d4dc77b991 (patch) | |
| tree | 0fc18976815572ac2f9cab2e01236243e684eb4d /src/libstd/io | |
| parent | 1f2ead1629ce544d98f35225061d216abd86d5a6 (diff) | |
| download | rust-e921e3f04513ffb094208a538a2835d4dc77b991.tar.gz rust-e921e3f04513ffb094208a538a2835d4dc77b991.zip | |
Rollup test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/timer.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 813edc3eb53..539fcb23bb0 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1918,7 +1918,7 @@ impl fmt::Show for FilePermission { #[cfg(test)] mod tests { use self::BadReaderBehavior::*; - use super::{IoResult, Reader, MemReader, NoProgress, InvalidInput}; + use super::{IoResult, MemReader, NoProgress, InvalidInput}; use prelude::v1::*; use uint; diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index de4270e705b..e073f76af82 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -225,8 +225,6 @@ fn in_ms_u64(d: Duration) -> u64 { #[cfg(test)] mod test { - use prelude::v1::*; - use super::Timer; use thread::Thread; use time::Duration; |