diff --git a/src/mat2.rs b/src/mat2.rs index a7f0d1d..59ca63d 100644 --- a/src/mat2.rs +++ b/src/mat2.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::Eq; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::util::swap; use core::vec::raw::buf_as_slice; @@ -200,11 +199,7 @@ impl + Add + Sub + Mul + Div + N #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Mat2, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } } @@ -381,10 +376,7 @@ impl + Add + Sub + Mul + Div + N impl Index> for Mat2 { #[inline(always)] fn index(&self, i: &uint) -> Vec2 { - unsafe { do buf_as_slice( - transmute::<*Mat2, *Vec2>( - to_unsafe_ptr(self)), 2) |slice| { slice[*i] } - } + unsafe { do buf_as_slice(transmute(self), 2) |slice| { slice[*i] } } } } diff --git a/src/mat3.rs b/src/mat3.rs index ffa8939..4b8176a 100644 --- a/src/mat3.rs +++ b/src/mat3.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::Eq; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::vec::raw::buf_as_slice; @@ -239,11 +238,7 @@ impl + Add + Sub + Mul + Div + N #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Mat3, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } } @@ -557,10 +552,7 @@ impl + Add + Sub + Mul + Div + N impl Index> for Mat3 { #[inline(always)] fn index(&self, i: &uint) -> Vec3 { - unsafe { do buf_as_slice( - transmute::<*Mat3, *Vec3>( - to_unsafe_ptr(self)), 3) |slice| { slice[*i] } - } + unsafe { do buf_as_slice(transmute(self), 3) |slice| { slice[*i] } } } } diff --git a/src/mat4.rs b/src/mat4.rs index 6fb6621..a1d9748 100644 --- a/src/mat4.rs +++ b/src/mat4.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::Eq; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::vec::raw::buf_as_slice; @@ -323,11 +322,7 @@ impl + Add + Sub + Mul + Div + N #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Mat4, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } } @@ -500,10 +495,7 @@ impl + Add + Sub + Mul + Div + N impl Index> for Mat4 { #[inline(always)] fn index(&self, i: &uint) -> Vec4 { - unsafe { do buf_as_slice( - transmute::<*Mat4, *Vec4>( - to_unsafe_ptr(self)), 4) |slice| { slice[*i] } - } + unsafe { do buf_as_slice(transmute(self), 4) |slice| { slice[*i] } } } } diff --git a/src/quat.rs b/src/quat.rs index d1da1bd..1cab448 100644 --- a/src/quat.rs +++ b/src/quat.rs @@ -9,7 +9,6 @@ use core::cast::transmute; use core::cmp::{Eq, Ord}; -use core::ptr::to_unsafe_ptr; use core::vec::raw::buf_as_slice; use std::cmp::{FuzzyEq, FUZZY_EPSILON}; @@ -353,11 +352,7 @@ pub impl + Add + Sub + Mul + Div */ #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Quat, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } /** @@ -392,10 +387,7 @@ pub impl + Add + Sub + Mul + Div impl Index for Quat { #[inline(always)] fn index(&self, i: &uint) -> T { - unsafe { do buf_as_slice( - transmute::<*Quat, *T>( - to_unsafe_ptr(self)), 4) |slice| { slice[*i] } - } + unsafe { do buf_as_slice(transmute(self), 4) |slice| { slice[*i] } } } } diff --git a/src/vec2.rs b/src/vec2.rs index f893ce6..fff17c1 100644 --- a/src/vec2.rs +++ b/src/vec2.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::{Eq, Ord}; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::vec::raw::buf_as_slice; @@ -50,11 +49,7 @@ impl Vector for Vec2 { #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Vec2, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } } diff --git a/src/vec3.rs b/src/vec3.rs index 988a70d..1cbe0b6 100644 --- a/src/vec3.rs +++ b/src/vec3.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::{Eq, Ord}; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::vec::raw::buf_as_slice; @@ -52,11 +51,7 @@ impl Vector for Vec3 { #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Vec3, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } } diff --git a/src/vec4.rs b/src/vec4.rs index ec9b68a..6a57081 100644 --- a/src/vec4.rs +++ b/src/vec4.rs @@ -1,6 +1,5 @@ use core::cast::transmute; use core::cmp::{Eq, Ord}; -use core::ptr::to_unsafe_ptr; use core::sys::size_of; use core::vec::raw::buf_as_slice; @@ -50,11 +49,7 @@ impl Vector for Vec4 { #[inline(always)] fn to_ptr(&self) -> *T { - unsafe { - transmute::<*Vec4, *T>( - to_unsafe_ptr(self) - ) - } + unsafe { transmute(self) } } }