about summary refs log tree commit diff
path: root/src/libarena
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-02-08 22:16:42 -0800
committerBrian Anderson <banderson@mozilla.com>2014-02-09 00:17:41 -0800
commitc7710cdf4563533b211a16cb02a9b4cb70ed3ca9 (patch)
tree2c1280bdcad9bdd4a60a1df8dc18e4cae127a9aa /src/libarena
parentd433b80e026960b28ba660ebdb09175237e02e05 (diff)
std: Add move_val_init to mem. Replace direct intrinsic usage
Diffstat (limited to 'src/libarena')
-rw-r--r--src/libarena/lib.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs
index 3e3ecdda3b0..5ce034f2665 100644
--- a/src/libarena/lib.rs
+++ b/src/libarena/lib.rs
@@ -32,10 +32,10 @@ use collections::list;
 use std::cast::{transmute, transmute_mut, transmute_mut_region};
 use std::cast;
 use std::cell::{Cell, RefCell};
+use std::mem;
 use std::num;
 use std::ptr;
 use std::kinds::marker;
-use std::mem;
 use std::rc::Rc;
 use std::rt::global_heap;
 use std::unstable::intrinsics::{TyDesc, get_tydesc};
@@ -216,7 +216,7 @@ impl Arena {
         unsafe {
             let ptr = self.alloc_pod_inner(mem::size_of::<T>(), mem::min_align_of::<T>());
             let ptr: *mut T = transmute(ptr);
-            intrinsics::move_val_init(&mut (*ptr), op());
+            mem::move_val_init(&mut (*ptr), op());
             return transmute(ptr);
         }
     }
@@ -278,7 +278,7 @@ impl Arena {
             // has *not* been initialized yet.
             *ty_ptr = transmute(tydesc);
             // Actually initialize it
-            intrinsics::move_val_init(&mut(*ptr), op());
+            mem::move_val_init(&mut(*ptr), op());
             // Now that we are done, update the tydesc to indicate that
             // the object is there.
             *ty_ptr = bitpack_tydesc_ptr(tydesc, true);
@@ -379,7 +379,7 @@ impl TypedArenaChunk {
         let mut chunk = unsafe {
             let chunk = global_heap::exchange_malloc(size);
             let mut chunk: ~TypedArenaChunk = cast::transmute(chunk);
-            intrinsics::move_val_init(&mut chunk.next, next);
+            mem::move_val_init(&mut chunk.next, next);
             chunk
         };
 
@@ -466,7 +466,7 @@ impl<T> TypedArena<T> {
             }
 
             let ptr: &'a mut T = cast::transmute(this.ptr);
-            intrinsics::move_val_init(ptr, object);
+            mem::move_val_init(ptr, object);
             this.ptr = this.ptr.offset(1);
             let ptr: &'a T = ptr;
             ptr