about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorMikhail Zabaluev <mikhail.zabaluev@gmail.com>2015-02-04 01:00:38 +0200
committerMikhail Zabaluev <mikhail.zabaluev@gmail.com>2015-02-05 13:54:26 +0200
commit3ac862816fc57fb6047986624d98f986cbfd40b9 (patch)
tree3f98052301b15a4ddb142978f7c713dc06583f31 /src/libstd/sys
parent2bd8ec2d197809fc0f0efccf1de14419ffb17b2b (diff)
downloadrust-3ac862816fc57fb6047986624d98f986cbfd40b9.tar.gz
rust-3ac862816fc57fb6047986624d98f986cbfd40b9.zip
Replace usage of slice::from_raw_buf with slice::from_raw_parts
New functions, slice::from_raw_parts and slice::from_raw_parts_mut,
are added to implement the lifetime convention as agreed in RFC PR #556.
The functions slice::from_raw_buf and slice::from_raw_mut_buf are
left deprecated for the time being.
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/os.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs
index c71e2d057c3..d8e3e6981df 100644
--- a/src/libstd/sys/windows/os.rs
+++ b/src/libstd/sys/windows/os.rs
@@ -109,7 +109,7 @@ impl Iterator for Env {
                 len += 1;
             }
             let p = p as *const u16;
-            let s = slice::from_raw_buf(&p, len as usize);
+            let s = slice::from_raw_parts(p, len as usize);
             self.cur = self.cur.offset(len + 1);
 
             let (k, v) = match s.iter().position(|&b| b == '=' as u16) {
@@ -296,7 +296,7 @@ impl Iterator for Args {
 
             // Push it onto the list.
             let ptr = ptr as *const u16;
-            let buf = slice::from_raw_buf(&ptr, len as usize);
+            let buf = slice::from_raw_parts(ptr, len as usize);
             OsStringExt::from_wide(buf)
         })
     }