auto merge of #7016 : thestinger/rust/ptr, r=luqmana

2 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 446804f7b30..6ce6d81bf24 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -1179,7 +1179,7 @@ pub fn real_args() -> ~[~str] {
 #[cfg(windows)]
 pub fn real_args() -> ~[~str] {
     let mut nArgs: c_int = 0;
-    let lpArgCount = ptr::to_mut_unsafe_ptr(&mut nArgs);
+    let lpArgCount: *mut c_int = &mut nArgs;
     let lpCmdLine = unsafe { GetCommandLineW() };
     let szArgList = unsafe { CommandLineToArgvW(lpCmdLine, lpArgCount) };
 
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 6137b589bdb..7c52ccc967e 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -1315,8 +1315,8 @@ pub fn swap<T>(v: &mut [T], a: uint, b: uint) {
     unsafe {
         // Can't take two mutable loans from one vector, so instead just cast
         // them to their raw pointers to do the swap
-        let pa: *mut T = ptr::to_mut_unsafe_ptr(&mut v[a]);
-        let pb: *mut T = ptr::to_mut_unsafe_ptr(&mut v[b]);
+        let pa: *mut T = &mut v[a];
+        let pb: *mut T = &mut v[b];
         ptr::swap_ptr(pa, pb);
     }
 }