Fallout from renaming

7 files changed, 12 insertions, 12 deletions

diff --git a/src/librustrt/at_exit_imp.rs b/src/librustrt/at_exit_imp.rs
index 81376692981..8854c33b169 100644
--- a/src/librustrt/at_exit_imp.rs
+++ b/src/librustrt/at_exit_imp.rs
@@ -59,7 +59,7 @@ pub fn run() {
         v
     };
 
-    for to_run in cur.move_iter() {
+    for to_run in cur.into_iter() {
         to_run();
     }
 }
diff --git a/src/librustrt/exclusive.rs b/src/librustrt/exclusive.rs
index e5de2d195eb..d40f149a2a1 100644
--- a/src/librustrt/exclusive.rs
+++ b/src/librustrt/exclusive.rs
@@ -107,7 +107,7 @@ mod tests {
                 });
             };
 
-            for f in futures.mut_iter() { f.recv() }
+            for f in futures.iter_mut() { f.recv() }
 
             assert_eq!(**total.lock(), num_tasks * count);
         }
diff --git a/src/librustrt/local_heap.rs b/src/librustrt/local_heap.rs
index 273505c416a..fe377d9e75b 100644
--- a/src/librustrt/local_heap.rs
+++ b/src/librustrt/local_heap.rs
@@ -39,7 +39,7 @@ impl LocalHeap {
     pub fn new() -> LocalHeap {
         LocalHeap {
             memory_region: MemoryRegion { live_allocations: 0 },
-            live_allocs: ptr::mut_null(),
+            live_allocs: ptr::null_mut(),
         }
     }
 
@@ -58,7 +58,7 @@ impl LocalHeap {
             // allocations list
             mybox.drop_glue = drop_glue;
             mybox.ref_count = 1;
-            mybox.prev = ptr::mut_null();
+            mybox.prev = ptr::null_mut();
             mybox.next = self.live_allocs;
             if !self.live_allocs.is_null() {
                 unsafe { (*self.live_allocs).prev = alloc; }
@@ -165,7 +165,7 @@ impl LocalHeap {
         //! Walks the internal list of allocations
 
         let mut alloc = self.live_allocs;
-        while alloc != ptr::mut_null() {
+        while alloc != ptr::null_mut() {
             let next_before = (*alloc).next;
 
             f(self, alloc);
diff --git a/src/librustrt/local_ptr.rs b/src/librustrt/local_ptr.rs
index 8ce12a5157d..92a67da20b6 100644
--- a/src/librustrt/local_ptr.rs
+++ b/src/librustrt/local_ptr.rs
@@ -282,7 +282,7 @@ pub mod native {
             rtabort!("thread-local pointer is null. bogus!");
         }
         let ptr: Box<T> = mem::transmute(void_ptr);
-        tls::set(key, ptr::mut_null());
+        tls::set(key, ptr::null_mut());
         return ptr;
     }
 
@@ -300,7 +300,7 @@ pub mod native {
                     None
                 } else {
                     let ptr: Box<T> = mem::transmute(void_ptr);
-                    tls::set(key, ptr::mut_null());
+                    tls::set(key, ptr::null_mut());
                     Some(ptr)
                 }
             }
diff --git a/src/librustrt/mutex.rs b/src/librustrt/mutex.rs
index 3aa798aa92a..f4fff43fd7c 100644
--- a/src/librustrt/mutex.rs
+++ b/src/librustrt/mutex.rs
@@ -615,7 +615,7 @@ mod imp {
     }
 
     pub unsafe fn init_cond() -> uint {
-        return CreateEventA(ptr::mut_null(), libc::FALSE, libc::FALSE,
+        return CreateEventA(ptr::null_mut(), libc::FALSE, libc::FALSE,
                             ptr::null()) as uint;
     }
 
diff --git a/src/librustrt/thread.rs b/src/librustrt/thread.rs
index 6d18ec4f9f5..bef799d4178 100644
--- a/src/librustrt/thread.rs
+++ b/src/librustrt/thread.rs
@@ -171,8 +171,8 @@ mod imp {
         // kernel does, might as well make it explicit.  With the current
         // 20 kB red zone, that makes for a 64 kB minimum stack.
         let stack_size = (cmp::max(stack, RED_ZONE) + 0xfffe) & (-0xfffe - 1);
-        let ret = CreateThread(ptr::mut_null(), stack_size as libc::size_t,
-                               super::thread_start, arg, 0, ptr::mut_null());
+        let ret = CreateThread(ptr::null_mut(), stack_size as libc::size_t,
+                               super::thread_start, arg, 0, ptr::null_mut());
 
         if ret as uint == 0 {
             // be sure to not leak the closure
@@ -268,7 +268,7 @@ mod imp {
     }
 
     pub unsafe fn join(native: rust_thread) {
-        assert_eq!(pthread_join(native, ptr::mut_null()), 0);
+        assert_eq!(pthread_join(native, ptr::null_mut()), 0);
     }
 
     pub unsafe fn detach(native: rust_thread) {
diff --git a/src/librustrt/util.rs b/src/librustrt/util.rs
index 1334000ed1f..77e3e25eb0e 100644
--- a/src/librustrt/util.rs
+++ b/src/librustrt/util.rs
@@ -62,7 +62,7 @@ pub fn abort(args: &fmt::Arguments) -> ! {
     }
     impl<'a> FormatWriter for BufWriter<'a> {
         fn write(&mut self, bytes: &[u8]) -> fmt::Result {
-            let left = self.buf.mut_slice_from(self.pos);
+            let left = self.buf.slice_from_mut(self.pos);
             let to_write = bytes.slice_to(cmp::min(bytes.len(), left.len()));
             slice::bytes::copy_memory(left, to_write);
             self.pos += to_write.len();