diff options
| author | Richo Healey <richo@psych0tik.net> | 2014-06-21 03:39:03 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-08 13:01:43 -0700 |
| commit | 12c334a77b897f7b1cb6cff3c56a71ecb89c82af (patch) | |
| tree | 1f5a85061a69058875391ec6171cf8b446996dff /src/libstd/dynamic_lib.rs | |
| parent | bfe4ddfdea45533c98657701509bb7185fd96cba (diff) | |
| download | rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.tar.gz rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.zip | |
std: Rename the `ToStr` trait to `ToString`, and `to_str` to `to_string`.
[breaking-change]
Diffstat (limited to 'src/libstd/dynamic_lib.rs')
| -rw-r--r-- | src/libstd/dynamic_lib.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 728875ce260..86283f03381 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -209,13 +209,11 @@ mod test { #[cfg(target_os = "ios")] #[cfg(target_os = "freebsd")] pub mod dl { - use prelude::*; use c_str::{CString, ToCStr}; use libc; use ptr; use result::*; - use str::StrAllocating; use string::String; pub unsafe fn open_external<T: ToCStr>(filename: T) -> *mut u8 { @@ -243,9 +241,8 @@ pub mod dl { let ret = if ptr::null() == last_error { Ok(result) } else { - Err(CString::new(last_error, false).as_str() - .unwrap() - .to_string()) + Err(String::from_str(CString::new(last_error, false).as_str() + .unwrap())) }; ret |