diff options
| author | bors <bors@rust-lang.org> | 2015-03-21 05:25:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-21 05:25:21 +0000 |
| commit | ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61 (patch) | |
| tree | 03752d10ba340b85b8720647c7919a97b21d694b /src/libstd/dynamic_lib.rs | |
| parent | e2fa53e593a854a609ae9efe5a1bbe15265f0a6f (diff) | |
| parent | 212e03181e422f569b6426bc08b713a9efc0d0eb (diff) | |
| download | rust-ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61.tar.gz rust-ecf8c64e1b1b60f228f0c472c0b0dab4a5b5aa61.zip | |
Auto merge of #23470 - alexcrichton:less-prelude, r=aturon
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/dynamic_lib.rs')
| -rw-r--r-- | src/libstd/dynamic_lib.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index a42809127bf..085bf01612d 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -18,11 +18,12 @@ use prelude::v1::*; +use env; use ffi::CString; use mem; -use env; -use str; +use old_path::{Path, GenericPath}; use os; +use str; pub struct DynamicLibrary { handle: *mut u8 @@ -133,6 +134,7 @@ mod test { use super::*; use prelude::v1::*; use libc; + use old_path::Path; use mem; #[test] @@ -140,8 +142,7 @@ mod test { fn test_loading_cosine() { // The math library does not need to be loaded since it is already // statically linked in - let none: Option<&Path> = None; // appease the typechecker - let libm = match DynamicLibrary::open(none) { + let libm = match DynamicLibrary::open(None) { Err(error) => panic!("Could not load self as module: {}", error), Ok(libm) => libm }; |
