Test fixes and rebase conflicts, round 2

2015-03-27 13:22:26 -07:00
parent 1c78478c12
commit d65fee28d3
6 changed files with 8 additions and 17 deletions
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -21,8 +21,6 @@ use env;
 use ffi::{AsOsStr, CString, OsString};
 use mem;
 use path::{Path, PathBuf};
-#[cfg(not(target_os = "android"))] use os;
-#[cfg(not(target_os = "android"))] use str;

 pub struct DynamicLibrary {
    handle: *mut u8