diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-17 13:33:26 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-20 20:07:19 -0700 |
| commit | 212e03181e422f569b6426bc08b713a9efc0d0eb (patch) | |
| tree | 4ab0963cf9b9a231d092636782703117c8c3fc6d /src/libstd/sys/windows | |
| parent | 68d69415637186755482d2584e6ba82b67bc1d89 (diff) | |
| download | rust-212e03181e422f569b6426bc08b713a9efc0d0eb.tar.gz rust-212e03181e422f569b6426bc08b713a9efc0d0eb.zip | |
std: Remove old_io/old_path from the prelude
This commit removes the reexports of `old_io` traits as well as `old_path` types and traits from the prelude. This functionality is now all deprecated and needs to be removed to make way for other functionality like `Seek` in the `std::io` module (currently reexported as `NewSeek` in the io prelude). Closes #23377 Closes #23378
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/backtrace.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys/windows/fs.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/tty.rs | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs index 8935f97ce5d..ffa4b37b487 100644 --- a/src/libstd/sys/windows/backtrace.rs +++ b/src/libstd/sys/windows/backtrace.rs @@ -26,14 +26,15 @@ #![allow(deprecated)] // for old path for dynamic lib use prelude::v1::*; +use io::prelude::*; use dynamic_lib::DynamicLibrary; -use io; -use io::prelude::*; use ffi::CStr; use intrinsics; +use io; use libc; use mem; +use old_path::Path; use ptr; use str; use sync::{StaticMutex, MUTEX_INIT}; diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index a218fb26fda..e7a01478908 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -22,6 +22,7 @@ use prelude::v1::*; use sys; use sys_common::{self, mkerr_libc}; +use old_path::{Path, GenericPath}; use old_io::{FilePermission, Write, UnstableFileStat, Open, FileAccess, FileMode}; use old_io::{IoResult, IoError, FileStat, SeekStyle}; use old_io::{Read, Truncate, SeekCur, SeekSet, ReadWrite, SeekEnd, Append}; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index e465ecaa5f6..e08a6e6b3cd 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -24,7 +24,7 @@ use old_io::process::{ProcessExit, ExitStatus}; use old_io::{IoResult, IoError}; use old_io; use os; -use old_path::BytesContainer; +use old_path::{BytesContainer, GenericPath}; use ptr; use str; use sync::{StaticMutex, MUTEX_INIT}; diff --git a/src/libstd/sys/windows/tty.rs b/src/libstd/sys/windows/tty.rs index f542cb2323e..52f4cce4aa3 100644 --- a/src/libstd/sys/windows/tty.rs +++ b/src/libstd/sys/windows/tty.rs @@ -29,7 +29,7 @@ use prelude::v1::*; -use old_io::{self, IoError, IoResult, MemReader}; +use old_io::{self, IoError, IoResult, MemReader, Reader}; use iter::repeat; use libc::types::os::arch::extra::LPCVOID; use libc::{c_int, HANDLE, LPDWORD, DWORD, LPVOID}; |
