about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorAdolfo OchagavĂ­a <aochagavia92@gmail.com>2014-07-10 17:43:03 +0200
committerAdolfo OchagavĂ­a <aochagavia92@gmail.com>2014-07-15 19:55:19 +0200
commit6ac4fc7fc2fb48599dbba55fcea5cfc1e6cd4602 (patch)
tree50f3c0ebee097596588282f1260bed2fdaa122fd /src/libnative
parent173baac495485848335cf5ffd52fcd4d061d6d50 (diff)
downloadrust-6ac4fc7fc2fb48599dbba55fcea5cfc1e6cd4602.tar.gz
rust-6ac4fc7fc2fb48599dbba55fcea5cfc1e6cd4602.zip
Deprecate `str::from_utf16`
Use `String::from_utf16` instead

[breaking-change]
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/file_win32.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_win32.rs
index dbca4ff7ff7..0f8fa261802 100644
--- a/src/libnative/io/file_win32.rs
+++ b/src/libnative/io/file_win32.rs
@@ -378,7 +378,7 @@ pub fn readdir(p: &CString) -> IoResult<Vec<CString>> {
                 } else {
                     let fp_vec = vec::raw::from_buf(fp_buf, libc::wcslen(fp_buf) as uint);
                     let fp_trimmed = str::truncate_utf16_at_nul(fp_vec.as_slice());
-                    let fp_str = str::from_utf16(fp_trimmed)
+                    let fp_str = String::from_utf16(fp_trimmed)
                             .expect("rust_list_dir_wfd_fp_buf returned invalid UTF-16");
                     paths.push(Path::new(fp_str));
                 }