std: Move size/align functions to std::mem. #2240

18 files changed, 56 insertions, 56 deletions

diff --git a/src/test/run-fail/bounds-check-no-overflow.rs b/src/test/run-fail/bounds-check-no-overflow.rs
index 679f060a55d..faced3531f5 100644
--- a/src/test/run-fail/bounds-check-no-overflow.rs
+++ b/src/test/run-fail/bounds-check-no-overflow.rs
@@ -11,7 +11,7 @@
 // error-pattern:index out of bounds: the len is 3 but the index is
 
 use std::uint::max_value;
-use std::sys::size_of;
+use std::mem::size_of;
 
 fn main() {
     let xs = [1, 2, 3];
diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/bug-2470-bounds-check-overflow.rs
index 083ea5b8f19..17b4c83788c 100644
--- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs
+++ b/src/test/run-fail/bug-2470-bounds-check-overflow.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:index out of bounds
 
-use std::sys;
+use std::mem;
 
 fn main() {
 
@@ -23,12 +23,12 @@ fn main() {
     let x = ~[1u,2u,3u];
     do x.as_imm_buf |p, _len| {
         let base = p as uint;
-        let idx = base / sys::size_of::<uint>();
+        let idx = base / mem::size_of::<uint>();
         error2!("ov1 base = 0x{:x}", base);
         error2!("ov1 idx = 0x{:x}", idx);
-        error2!("ov1 sizeof::<uint>() = 0x{:x}", sys::size_of::<uint>());
+        error2!("ov1 sizeof::<uint>() = 0x{:x}", mem::size_of::<uint>());
         error2!("ov1 idx * sizeof::<uint>() = 0x{:x}",
-               idx * sys::size_of::<uint>());
+               idx * mem::size_of::<uint>());
 
         // This should fail.
         error2!("ov1 0x{:x}",  x[idx]);
diff --git a/src/test/run-pass/attr-no-drop-flag-size.rs b/src/test/run-pass/attr-no-drop-flag-size.rs
index bbc6501bc77..48768a1c6fd 100644
--- a/src/test/run-pass/attr-no-drop-flag-size.rs
+++ b/src/test/run-pass/attr-no-drop-flag-size.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys::size_of;
+use std::mem::size_of;
 
 #[unsafe_no_drop_flag]
 struct Test<T> {
diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/run-pass/enum-alignment.rs
index a36aaaf936d..4c60cfb7328 100644
--- a/src/test/run-pass/enum-alignment.rs
+++ b/src/test/run-pass/enum-alignment.rs
@@ -10,7 +10,7 @@
 
 use std::cast;
 use std::ptr;
-use std::sys;
+use std::mem;
 
 fn addr_of<T>(ptr: &T) -> uint {
     let ptr = ptr::to_unsafe_ptr(ptr);
@@ -20,7 +20,7 @@ fn addr_of<T>(ptr: &T) -> uint {
 fn is_aligned<T>(ptr: &T) -> bool {
     unsafe {
         let addr: uint = cast::transmute(ptr);
-        (addr % sys::min_align_of::<T>()) == 0
+        (addr % mem::min_align_of::<T>()) == 0
     }
 }
 
diff --git a/src/test/run-pass/enum-discrim-width-stuff.rs b/src/test/run-pass/enum-discrim-width-stuff.rs
index 71f0b0f9475..65f93b1c3c2 100644
--- a/src/test/run-pass/enum-discrim-width-stuff.rs
+++ b/src/test/run-pass/enum-discrim-width-stuff.rs
@@ -8,12 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 pub fn main() {
     enum E { V = 0x1717171717171717 }
     static C: E = V;
-    let expected: u64 = if sys::size_of::<uint>() < 8 {
+    let expected: u64 = if mem::size_of::<uint>() < 8 {
         0x17171717
     } else {
         0x1717171717171717
diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/run-pass/fn-bare-size.rs
index 144cc7c1e28..cdde98331e2 100644
--- a/src/test/run-pass/fn-bare-size.rs
+++ b/src/test/run-pass/fn-bare-size.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 pub fn main() {
     // Bare functions should just be a pointer
-    assert_eq!(sys::size_of::<extern "Rust" fn()>(), sys::size_of::<int>());
+    assert_eq!(mem::size_of::<extern "Rust" fn()>(), mem::size_of::<int>());
 }
diff --git a/src/test/run-pass/issue-2895.rs b/src/test/run-pass/issue-2895.rs
index f325756d368..1e1db393780 100644
--- a/src/test/run-pass/issue-2895.rs
+++ b/src/test/run-pass/issue-2895.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 struct Cat {
     x: int
@@ -24,13 +24,13 @@ impl Drop for Kitty {
 
 #[cfg(target_arch = "x86_64")]
 pub fn main() {
-    assert_eq!(sys::size_of::<Cat>(), 8 as uint);
-    assert_eq!(sys::size_of::<Kitty>(), 16 as uint);
+    assert_eq!(mem::size_of::<Cat>(), 8 as uint);
+    assert_eq!(mem::size_of::<Kitty>(), 16 as uint);
 }
 
 #[cfg(target_arch = "x86")]
 #[cfg(target_arch = "arm")]
 pub fn main() {
-    assert_eq!(sys::size_of::<Cat>(), 4 as uint);
-    assert_eq!(sys::size_of::<Kitty>(), 8 as uint);
+    assert_eq!(mem::size_of::<Cat>(), 4 as uint);
+    assert_eq!(mem::size_of::<Kitty>(), 8 as uint);
 }
diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs
index 15cd508b655..228b91a4532 100644
--- a/src/test/run-pass/nullable-pointer-size.rs
+++ b/src/test/run-pass/nullable-pointer-size.rs
@@ -10,7 +10,7 @@
 
 #[feature(macro_rules)];
 
-use std::sys;
+use std::mem;
 
 enum E<T> { Thing(int, T), Nothing((), ((), ()), [i8, ..0]) }
 struct S<T>(int, T);
@@ -19,13 +19,13 @@ struct S<T>(int, T);
 
 macro_rules! check_option {
     ($T:ty) => {
-        assert_eq!(sys::size_of::<Option<$T>>(), sys::size_of::<$T>());
+        assert_eq!(mem::size_of::<Option<$T>>(), mem::size_of::<$T>());
     }
 }
 
 macro_rules! check_fancy {
     ($T:ty) => {
-        assert_eq!(sys::size_of::<E<$T>>(), sys::size_of::<S<$T>>());
+        assert_eq!(mem::size_of::<E<$T>>(), mem::size_of::<S<$T>>());
     }
 }
 
diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/run-pass/packed-struct-generic-size.rs
index 798acc646be..1d3d8cf736f 100644
--- a/src/test/run-pass/packed-struct-generic-size.rs
+++ b/src/test/run-pass/packed-struct-generic-size.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 #[packed]
 struct S<T, S> {
@@ -18,10 +18,10 @@ struct S<T, S> {
 }
 
 pub fn main() {
-    assert_eq!(sys::size_of::<S<u8, u8>>(), 3);
+    assert_eq!(mem::size_of::<S<u8, u8>>(), 3);
 
-    assert_eq!(sys::size_of::<S<u64, u16>>(), 11);
+    assert_eq!(mem::size_of::<S<u64, u16>>(), 11);
 
-    assert_eq!(sys::size_of::<S<~str, @mut [int]>>(),
-               1 + sys::size_of::<~str>() + sys::size_of::<@mut [int]>());
+    assert_eq!(mem::size_of::<S<~str, @mut [int]>>(),
+               1 + mem::size_of::<~str>() + mem::size_of::<@mut [int]>());
 }
diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/run-pass/packed-struct-size-xc.rs
index 19f6046c7d6..5b4426d314b 100644
--- a/src/test/run-pass/packed-struct-size-xc.rs
+++ b/src/test/run-pass/packed-struct-size-xc.rs
@@ -3,8 +3,8 @@
 
 extern mod packed;
 
-use std::sys;
+use std::mem;
 
 fn main() {
-    assert_eq!(sys::size_of::<packed::S>(), 5);
+    assert_eq!(mem::size_of::<packed::S>(), 5);
 }
diff --git a/src/test/run-pass/packed-struct-size.rs b/src/test/run-pass/packed-struct-size.rs
index b94b4db5f60..cc4cb99e2f6 100644
--- a/src/test/run-pass/packed-struct-size.rs
+++ b/src/test/run-pass/packed-struct-size.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 #[packed]
 struct S4 {
@@ -57,9 +57,9 @@ static TEST_S3_Foo: S3_Foo = S3_Foo { a: 1, b: 2, c: Baz };
 
 
 pub fn main() {
-    assert_eq!(sys::size_of::<S4>(), 4);
-    assert_eq!(sys::size_of::<S5>(), 5);
-    assert_eq!(sys::size_of::<S13_str>(), 13 + sys::size_of::<~str>());
-    assert_eq!(sys::size_of::<S3_Foo>(), 3 + sys::size_of::<Foo>());
-    assert_eq!(sys::size_of::<S7_Option>(), 7 + sys::size_of::<Option<@mut f64>>());
+    assert_eq!(mem::size_of::<S4>(), 4);
+    assert_eq!(mem::size_of::<S5>(), 5);
+    assert_eq!(mem::size_of::<S13_str>(), 13 + mem::size_of::<~str>());
+    assert_eq!(mem::size_of::<S3_Foo>(), 3 + mem::size_of::<Foo>());
+    assert_eq!(mem::size_of::<S7_Option>(), 7 + mem::size_of::<Option<@mut f64>>());
 }
diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/run-pass/packed-struct-vec.rs
index 6cf519a387f..6007cc251c9 100644
--- a/src/test/run-pass/packed-struct-vec.rs
+++ b/src/test/run-pass/packed-struct-vec.rs
@@ -10,7 +10,7 @@
 
 // xfail-android: FIXME(#9116) Bus error
 
-use std::sys;
+use std::mem;
 
 #[packed]
 #[deriving(Eq)]
@@ -22,7 +22,7 @@ struct Foo {
 pub fn main() {
     let foos = [Foo { bar: 1, baz: 2 }, .. 10];
 
-    assert_eq!(sys::size_of::<[Foo, .. 10]>(), 90);
+    assert_eq!(mem::size_of::<[Foo, .. 10]>(), 90);
 
     for i in range(0u, 10) {
         assert_eq!(foos[i], Foo { bar: 1, baz: 2});
diff --git a/src/test/run-pass/packed-tuple-struct-size.rs b/src/test/run-pass/packed-tuple-struct-size.rs
index dd38a6b7d12..76362ffeaaf 100644
--- a/src/test/run-pass/packed-tuple-struct-size.rs
+++ b/src/test/run-pass/packed-tuple-struct-size.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::sys;
+use std::mem;
 
 #[packed]
 struct S4(u8,[u8, .. 3]);
@@ -31,16 +31,16 @@ struct S3_Foo(u8, u16, Foo);
 struct S7_Option(f32, u8, u16, Option<@mut f64>);
 
 pub fn main() {
-    assert_eq!(sys::size_of::<S4>(), 4);
+    assert_eq!(mem::size_of::<S4>(), 4);
 
-    assert_eq!(sys::size_of::<S5>(), 5);
+    assert_eq!(mem::size_of::<S5>(), 5);
 
-    assert_eq!(sys::size_of::<S13_str>(),
-               13 + sys::size_of::<~str>());
+    assert_eq!(mem::size_of::<S13_str>(),
+               13 + mem::size_of::<~str>());
 
-    assert_eq!(sys::size_of::<S3_Foo>(),
-               3 + sys::size_of::<Foo>());
+    assert_eq!(mem::size_of::<S3_Foo>(),
+               3 + mem::size_of::<Foo>());
 
-    assert_eq!(sys::size_of::<S7_Option>(),
-              7 + sys::size_of::<Option<@mut f64>>());
+    assert_eq!(mem::size_of::<S7_Option>(),
+              7 + mem::size_of::<Option<@mut f64>>());
 }
diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs
index 804e6902002..43304b66176 100644
--- a/src/test/run-pass/rec-align-u32.rs
+++ b/src/test/run-pass/rec-align-u32.rs
@@ -12,7 +12,7 @@
 
 // Issue #2303
 
-use std::sys;
+use std::mem;
 
 mod rusti {
     extern "rust-intrinsic" {
@@ -55,7 +55,7 @@ pub fn main() {
         let y = format!("{:?}", x);
 
         info2!("align inner = {:?}", rusti::min_align_of::<Inner>());
-        info2!("size outer = {:?}", sys::size_of::<Outer>());
+        info2!("size outer = {:?}", mem::size_of::<Outer>());
         info2!("y = {}", y);
 
         // per clang/gcc the alignment of `inner` is 4 on x86.
@@ -63,7 +63,7 @@ pub fn main() {
 
         // per clang/gcc the size of `outer` should be 12
         // because `inner`s alignment was 4.
-        assert_eq!(sys::size_of::<Outer>(), m::size());
+        assert_eq!(mem::size_of::<Outer>(), m::size());
 
         assert_eq!(y, ~"Outer{c8: 22u8, t: Inner{c64: 44u32}}");
     }
diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs
index 6ec2b63cfff..5adb8cf9510 100644
--- a/src/test/run-pass/rec-align-u64.rs
+++ b/src/test/run-pass/rec-align-u64.rs
@@ -12,7 +12,7 @@
 
 // Issue #2303
 
-use std::sys;
+use std::mem;
 
 mod rusti {
     extern "rust-intrinsic" {
@@ -77,7 +77,7 @@ pub fn main() {
         let y = format!("{:?}", x);
 
         info2!("align inner = {}", rusti::min_align_of::<Inner>());
-        info2!("size outer = {}", sys::size_of::<Outer>());
+        info2!("size outer = {}", mem::size_of::<Outer>());
         info2!("y = {}", y);
 
         // per clang/gcc the alignment of `Inner` is 4 on x86.
@@ -85,7 +85,7 @@ pub fn main() {
 
         // per clang/gcc the size of `Outer` should be 12
         // because `Inner`s alignment was 4.
-        assert_eq!(sys::size_of::<Outer>(), m::m::size());
+        assert_eq!(mem::size_of::<Outer>(), m::m::size());
 
         assert_eq!(y, ~"Outer{c8: 22u8, t: Inner{c64: 44u64}}");
     }
diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs
index 85cc8b224f6..5a2243b1940 100644
--- a/src/test/run-pass/reflect-visit-data.rs
+++ b/src/test/run-pass/reflect-visit-data.rs
@@ -12,7 +12,7 @@
 
 use std::libc::c_void;
 use std::ptr;
-use std::sys;
+use std::mem;
 use std::unstable::intrinsics::{TyDesc, get_tydesc, visit_tydesc, TyVisitor, Opaque};
 use std::unstable::raw::Vec;
 
@@ -49,12 +49,12 @@ impl<V:TyVisitor + movable_ptr> ptr_visit_adaptor<V> {
 
     #[inline(always)]
     pub fn align_to<T>(&mut self) {
-        self.align(sys::min_align_of::<T>());
+        self.align(mem::min_align_of::<T>());
     }
 
     #[inline(always)]
     pub fn bump_past<T>(&mut self) {
-        self.bump(sys::size_of::<T>());
+        self.bump(mem::size_of::<T>());
     }
 
 }
diff --git a/src/test/run-pass/regions-mock-trans.rs b/src/test/run-pass/regions-mock-trans.rs
index 201584d48a5..e66a34b47bc 100644
--- a/src/test/run-pass/regions-mock-trans.rs
+++ b/src/test/run-pass/regions-mock-trans.rs
@@ -10,7 +10,7 @@
 
 use std::cast;
 use std::libc;
-use std::sys;
+use std::mem;
 
 struct arena(());
 
@@ -30,7 +30,7 @@ struct Ccx {
 #[fixed_stack_segment] #[inline(never)]
 fn alloc<'a>(_bcx : &'a arena) -> &'a Bcx<'a> {
     unsafe {
-        cast::transmute(libc::malloc(sys::size_of::<Bcx<'blk>>()
+        cast::transmute(libc::malloc(mem::size_of::<Bcx<'blk>>()
             as libc::size_t))
     }
 }
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index 5695254cdbf..2cdff23050d 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 extern mod std;
-use std::sys::size_of;
+use std::mem::size_of;
 
 struct t {a: u8, b: i8}
 struct u {a: u8, b: i8, c: u8}