diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:57:50 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 16:10:37 -0800 |
| commit | 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2 (patch) | |
| tree | c49c538f8e87842bb6371f97ece94ceaa0bcca8e /src/libstd/io | |
| parent | 26cd8eae48ea99bda183c5224bc423991ccfaf1f (diff) | |
| download | rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.tar.gz rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mem.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 9e6af86925b..9a6ad04fdbc 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -13,7 +13,7 @@ //! Readers and Writers for in-memory buffers use cmp::min; -use prelude::v1::Index; +use ops::Index; use option::Option::None; use result::Result::{Err, Ok}; use io; |