diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 13:04:27 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 13:04:27 -0700 |
| commit | 828c36932a227e3689d10db8ec9edc19ba0af6c4 (patch) | |
| tree | 48dcc0b5db1ad8cae3b9043ae4134b113b30c872 /src/librustc/plugin | |
| parent | 8ec3695a6774ffaad11dead0fda399102060790e (diff) | |
| parent | 6acf385c9674a359b5b45f6e127521dd1515668c (diff) | |
| download | rust-828c36932a227e3689d10db8ec9edc19ba0af6c4.tar.gz rust-828c36932a227e3689d10db8ec9edc19ba0af6c4.zip | |
rollup merge of #23197: aatxe/master
`std::dynamic_library` is currently using `std::old_io::Path` specifically. This change brings the API in alignment with `std::fs::File` by having it take `std::path::AsPath`. The Windows code should work, but I admittedly haven't tried it (I don't have a Windows machine readily available right now). r? @alexcrichton
Diffstat (limited to 'src/librustc/plugin')
| -rw-r--r-- | src/librustc/plugin/load.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/librustc/plugin/load.rs b/src/librustc/plugin/load.rs index 6fd74479f75..752e71bc191 100644 --- a/src/librustc/plugin/load.rs +++ b/src/librustc/plugin/load.rs @@ -18,10 +18,6 @@ use std::borrow::ToOwned; use std::dynamic_lib::DynamicLibrary; use std::env; use std::mem; - -#[allow(deprecated)] -use std::old_path; - use std::path::PathBuf; use syntax::ast; use syntax::codemap::{Span, COMMAND_LINE_SP}; @@ -110,7 +106,6 @@ impl<'a> PluginLoader<'a> { symbol: String) -> PluginRegistrarFun { // Make sure the path contains a / or the linker will search for it. let path = env::current_dir().unwrap().join(&path); - let path = old_path::Path::new(path.to_str().unwrap()); let lib = match DynamicLibrary::open(Some(&path)) { Ok(lib) => lib, |
