srenblad/nalgebra
1
0
Fork 0
forked from M-Labs/nalgebra
Code Pull Requests Activity

upgrade to newer rust

Browse Source
This commit is contained in:
Robin Gloster 2014-10-22 13:35:17 +02:00
parent e2fc8aa764
commit 4e4eb62ffc
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/structs/dvec_macros.rs
View File

@ -40,7 +40,7 @@ macro_rules! dvec_impl(
#[inline] #[inline]
pub fn as_mut_slice<'a>(&'a mut self) -> &'a mut [N] { pub fn as_mut_slice<'a>(&'a mut self) -> &'a mut [N] {
let len = self.len(); let len = self.len();
self.at.mut_slice_to(len) self.at.slice_to_mut(len)
} }
} }
@ -80,7 +80,7 @@ macro_rules! dvec_impl(
#[inline] #[inline]
unsafe fn unsafe_set(&mut self, i: uint, val: N) { unsafe fn unsafe_set(&mut self, i: uint, val: N) {
*self.at.as_mut_slice().unsafe_mut_ref(i) = val *self.at.as_mut_slice().unsafe_mut(i) = val
} }
} }
@ -125,8 +125,8 @@ macro_rules! dvec_impl(
impl<N> IterableMut<N> for $dvec<N> { impl<N> IterableMut<N> for $dvec<N> {
#[inline] #[inline]
fn mut_iter<'l>(&'l mut self) -> MutItems<'l, N> { fn iter_mut<'l>(&'l mut self) -> MutItems<'l, N> {
self.as_mut_slice().mut_iter() self.as_mut_slice().iter_mut()
} }
} }
@ -246,7 +246,7 @@ macro_rules! dvec_impl(
fn normalize(&mut self) -> N { fn normalize(&mut self) -> N {
let l = Norm::norm(self); let l = Norm::norm(self);
for n in self.as_mut_slice().mut_iter() { for n in self.as_mut_slice().iter_mut() {
*n = *n / l; *n = *n / l;
} }
@ -424,7 +424,7 @@ macro_rules! small_dvec_from_impl (
let mut at: [N, ..$dim] = [ $( $zeros, )* ]; let mut at: [N, ..$dim] = [ $( $zeros, )* ];
for n in at.mut_slice_to(dim).mut_iter() { for n in at.slice_to_mut(dim).iter_mut() {
*n = elem.clone(); *n = elem.clone();
} }
@ -446,7 +446,7 @@ macro_rules! small_dvec_from_impl (
// FIXME: not safe. // FIXME: not safe.
let mut at: [N, ..$dim] = [ $( $zeros, )* ]; let mut at: [N, ..$dim] = [ $( $zeros, )* ];
for (curr, other) in vec.iter().zip(at.mut_iter()) { for (curr, other) in vec.iter().zip(at.iter_mut()) {
*other = curr.clone(); *other = curr.clone();
} }

14
src/structs/mat_macros.rs
View File

@ -20,13 +20,13 @@ macro_rules! at_fast_impl(
#[inline] #[inline]
pub unsafe fn at_fast(&self, (i, j): (uint, uint)) -> N { pub unsafe fn at_fast(&self, (i, j): (uint, uint)) -> N {
(*mem::transmute::<&$t<N>, &[N, ..$dim * $dim]>(self) (*mem::transmute::<&$t<N>, &[N, ..$dim * $dim]>(self)
.unsafe_ref(i + j * $dim)).clone() .unsafe_get(i + j * $dim)).clone()
} }
#[inline] #[inline]
pub unsafe fn set_fast(&mut self, (i, j): (uint, uint), val: N) { pub unsafe fn set_fast(&mut self, (i, j): (uint, uint), val: N) {
(*mem::transmute::<&mut $t<N>, &mut [N, ..$dim * $dim]>(self) (*mem::transmute::<&mut $t<N>, &mut [N, ..$dim * $dim]>(self)
.unsafe_mut_ref(i + j * $dim)) = val .unsafe_mut(i + j * $dim)) = val
} }
} }
) )
@ -151,9 +151,9 @@ macro_rules! iterable_mut_impl(
($t: ident, $dim: expr) => ( ($t: ident, $dim: expr) => (
impl<N> IterableMut<N> for $t<N> { impl<N> IterableMut<N> for $t<N> {
#[inline] #[inline]
fn mut_iter<'l>(&'l mut self) -> MutItems<'l, N> { fn iter_mut<'l>(&'l mut self) -> MutItems<'l, N> {
unsafe { unsafe {
mem::transmute::<&'l mut $t<N>, &'l mut [N, ..$dim * $dim]>(self).mut_iter() mem::transmute::<&'l mut $t<N>, &'l mut [N, ..$dim * $dim]>(self).iter_mut()
} }
} }
} }
@ -214,12 +214,12 @@ macro_rules! indexable_impl(
#[inline] #[inline]
unsafe fn unsafe_at(&self, (i, j): (uint, uint)) -> N { unsafe fn unsafe_at(&self, (i, j): (uint, uint)) -> N {
(*mem::transmute::<&$t<N>, &[N, ..$dim * $dim]>(self).unsafe_ref(i + j * $dim)).clone() (*mem::transmute::<&$t<N>, &[N, ..$dim * $dim]>(self).unsafe_get(i + j * $dim)).clone()
} }
#[inline] #[inline]
unsafe fn unsafe_set(&mut self, (i, j): (uint, uint), val: N) { unsafe fn unsafe_set(&mut self, (i, j): (uint, uint), val: N) {
(*mem::transmute::<&mut $t<N>, &mut [N, ..$dim * $dim]>(self).unsafe_mut_ref(i + j * $dim)) = val (*mem::transmute::<&mut $t<N>, &mut [N, ..$dim * $dim]>(self).unsafe_mut(i + j * $dim)) = val
} }
} }
) )
@ -276,7 +276,7 @@ macro_rules! row_impl(
fn row(&self, row: uint) -> $tv<N> { fn row(&self, row: uint) -> $tv<N> {
let mut res: $tv<N> = Zero::zero(); let mut res: $tv<N> = Zero::zero();
for (i, e) in res.mut_iter().enumerate() { for (i, e) in res.iter_mut().enumerate() {
*e = self.at((row, i)); *e = self.at((row, i));
} }

2
src/structs/spec/vec0.rs
View File

@ -45,7 +45,7 @@ impl<N: 'static> Iterable<N> for vec::Vec0<N> {
impl<N: 'static> IterableMut<N> for vec::Vec0<N> { impl<N: 'static> IterableMut<N> for vec::Vec0<N> {
#[inline] #[inline]
fn mut_iter<'l>(&'l mut self) -> MutItems<'l, N> { fn iter_mut<'l>(&'l mut self) -> MutItems<'l, N> {
unsafe { mem::transmute::<&'l mut vec::Vec0<N>, &'l mut [N, ..0]>(self).iter_mut() } unsafe { mem::transmute::<&'l mut vec::Vec0<N>, &'l mut [N, ..0]>(self).iter_mut() }
} }
} }

12
src/structs/vec_macros.rs
View File

@ -42,13 +42,13 @@ macro_rules! at_fast_impl(
#[inline] #[inline]
pub unsafe fn at_fast(&self, i: uint) -> N { pub unsafe fn at_fast(&self, i: uint) -> N {
(*mem::transmute::<&$t<N>, &[N, ..$dim]>(self) (*mem::transmute::<&$t<N>, &[N, ..$dim]>(self)
.unsafe_ref(i)).clone() .unsafe_get(i)).clone()
} }
/// Unsafe write access to a vector element by index. /// Unsafe write access to a vector element by index.
#[inline] #[inline]
pub unsafe fn set_fast(&mut self, i: uint, val: N) { pub unsafe fn set_fast(&mut self, i: uint, val: N) {
(*mem::transmute::<&mut $t<N>, &mut [N, ..$dim]>(self).unsafe_mut_ref(i)) = val (*mem::transmute::<&mut $t<N>, &mut [N, ..$dim]>(self).unsafe_mut(i)) = val
} }
} }
) )
@ -199,12 +199,12 @@ macro_rules! indexable_impl(
#[inline] #[inline]
unsafe fn unsafe_at(&self, i: uint) -> N { unsafe fn unsafe_at(&self, i: uint) -> N {
(*mem::transmute::<&$t<N>, &[N, ..$dim]>(self).unsafe_ref(i)).clone() (*mem::transmute::<&$t<N>, &[N, ..$dim]>(self).unsafe_get(i)).clone()
} }
#[inline] #[inline]
unsafe fn unsafe_set(&mut self, i: uint, val: N) { unsafe fn unsafe_set(&mut self, i: uint, val: N) {
(*mem::transmute::<&mut $t<N>, &mut [N, ..$dim]>(self).unsafe_mut_ref(i)) = val (*mem::transmute::<&mut $t<N>, &mut [N, ..$dim]>(self).unsafe_mut(i)) = val
} }
} }
) )
@ -258,9 +258,9 @@ macro_rules! iterable_mut_impl(
($t: ident, $dim: expr) => ( ($t: ident, $dim: expr) => (
impl<N> IterableMut<N> for $t<N> { impl<N> IterableMut<N> for $t<N> {
#[inline] #[inline]
fn mut_iter<'l>(&'l mut self) -> MutItems<'l, N> { fn iter_mut<'l>(&'l mut self) -> MutItems<'l, N> {
unsafe { unsafe {
mem::transmute::<&'l mut $t<N>, &'l mut [N, ..$dim]>(self).mut_iter() mem::transmute::<&'l mut $t<N>, &'l mut [N, ..$dim]>(self).iter_mut()
} }
} }
} }

2
src/traits/structure.rs
View File

@ -139,7 +139,7 @@ pub trait Iterable<N> {
/// Traits of mutable objects which can be iterated through like a vector. /// Traits of mutable objects which can be iterated through like a vector.
pub trait IterableMut<N> { pub trait IterableMut<N> {
/// Gets a vector-like read-write iterator. /// Gets a vector-like read-write iterator.
fn mut_iter<'l>(&'l mut self) -> MutItems<'l, N>; fn iter_mut<'l>(&'l mut self) -> MutItems<'l, N>;
} }
/* /*

24
tests/vec.rs
View File

@ -14,7 +14,7 @@ macro_rules! test_iterator_impl(
let nv: $t = v.iter().map(|e| e * n).collect(); let nv: $t = v.iter().map(|e| e * n).collect();
for e in mv.mut_iter() { for e in mv.iter_mut() {
*e = *e * n *e = *e * n
} }
@ -28,7 +28,7 @@ macro_rules! test_commut_dot_impl(
for _ in range(0u, 10000) { for _ in range(0u, 10000) {
let v1 : $t = random(); let v1 : $t = random();
let v2 : $t = random(); let v2 : $t = random();
assert!(na::approx_eq(&na::dot(&v1, &v2), &na::dot(&v2, &v1))); assert!(na::approx_eq(&na::dot(&v1, &v2), &na::dot(&v2, &v1)));
} }
); );
@ -39,7 +39,7 @@ macro_rules! test_scalar_op_impl(
for _ in range(0u, 10000) { for _ in range(0u, 10000) {
let v1 : $t = random(); let v1 : $t = random();
let n : $n = random(); let n : $n = random();
assert!(na::approx_eq(&((v1 * n) / n), &v1)); assert!(na::approx_eq(&((v1 * n) / n), &v1));
assert!(na::approx_eq(&((v1 / n) * n), &v1)); assert!(na::approx_eq(&((v1 / n) * n), &v1));
assert!(na::approx_eq(&((v1 - n) + n), &v1)); assert!(na::approx_eq(&((v1 - n) + n), &v1));
@ -51,7 +51,7 @@ macro_rules! test_scalar_op_impl(
v1 = v1 * n; v1 = v1 * n;
v1 = v1 / n; v1 = v1 / n;
assert!(na::approx_eq(&v1, &v0)); assert!(na::approx_eq(&v1, &v0));
} }
); );
@ -230,22 +230,22 @@ fn test_scalar_op_vec1() {
fn test_scalar_op_vec2() { fn test_scalar_op_vec2() {
test_scalar_op_impl!(Vec2<f64>, f64); test_scalar_op_impl!(Vec2<f64>, f64);
} }
#[test] #[test]
fn test_scalar_op_vec3() { fn test_scalar_op_vec3() {
test_scalar_op_impl!(Vec3<f64>, f64); test_scalar_op_impl!(Vec3<f64>, f64);
} }
#[test] #[test]
fn test_scalar_op_vec4() { fn test_scalar_op_vec4() {
test_scalar_op_impl!(Vec4<f64>, f64); test_scalar_op_impl!(Vec4<f64>, f64);
} }
#[test] #[test]
fn test_scalar_op_vec5() { fn test_scalar_op_vec5() {
test_scalar_op_impl!(Vec5<f64>, f64); test_scalar_op_impl!(Vec5<f64>, f64);
} }
#[test] #[test]
fn test_scalar_op_vec6() { fn test_scalar_op_vec6() {
test_scalar_op_impl!(Vec6<f64>, f64); test_scalar_op_impl!(Vec6<f64>, f64);
@ -265,22 +265,22 @@ fn test_iterator_vec1() {
fn test_iterator_vec2() { fn test_iterator_vec2() {
test_iterator_impl!(Vec2<f64>, f64); test_iterator_impl!(Vec2<f64>, f64);
} }
#[test] #[test]
fn test_iterator_vec3() { fn test_iterator_vec3() {
test_iterator_impl!(Vec3<f64>, f64); test_iterator_impl!(Vec3<f64>, f64);
} }
#[test] #[test]
fn test_iterator_vec4() { fn test_iterator_vec4() {
test_iterator_impl!(Vec4<f64>, f64); test_iterator_impl!(Vec4<f64>, f64);
} }
#[test] #[test]
fn test_iterator_vec5() { fn test_iterator_vec5() {
test_iterator_impl!(Vec5<f64>, f64); test_iterator_impl!(Vec5<f64>, f64);
} }
#[test] #[test]
fn test_iterator_vec6() { fn test_iterator_vec6() {
test_iterator_impl!(Vec6<f64>, f64); test_iterator_impl!(Vec6<f64>, f64);