From 224fc1085b96e6a497ed7d1bb47ef6f49674202b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Apr 2015 15:59:14 -0700 Subject: Test fixes and rebase conflicts, round 1 --- src/libstd/dynamic_lib.rs | 9 ++------- src/libstd/sys/windows/fs2.rs | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index c69df6435c4..8ca462f5a38 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -259,19 +259,14 @@ mod dl { #[cfg(target_os = "windows")] mod dl { + use prelude::v1::*; + use ffi::OsStr; - use iter::Iterator; use libc; use libc::consts::os::extra::ERROR_CALL_NOT_IMPLEMENTED; - use ops::FnOnce; use sys::os; use os::windows::prelude::*; - use option::Option::{self, Some, None}; use ptr; - use result::Result; - use result::Result::{Ok, Err}; - use string::String; - use vec::Vec; use sys::c::compat::kernel32::SetThreadErrorMode; pub fn open(filename: Option<&OsStr>) -> Result<*mut u8, String> { diff --git a/src/libstd/sys/windows/fs2.rs b/src/libstd/sys/windows/fs2.rs index af61eec319c..5ac9a0ace58 100644 --- a/src/libstd/sys/windows/fs2.rs +++ b/src/libstd/sys/windows/fs2.rs @@ -12,7 +12,6 @@ use core::prelude::*; use io::prelude::*; use os::windows::prelude::*; -use default::Default; use ffi::OsString; use fmt; use io::{self, Error, SeekFrom}; -- cgit 1.4.1-3-g733a5