From ec5ece46ca1283e88cffdc03c4e4e30ce1820864 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Sun, 29 Mar 2015 12:57:16 +0200 Subject: [PATCH 1/2] Use slicing syntax instead of deprecated methods --- src/structs/dmat.rs | 14 +++++++------- src/structs/dvec_macros.rs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/structs/dmat.rs b/src/structs/dmat.rs index 0838f1de..c7c2481a 100644 --- a/src/structs/dmat.rs +++ b/src/structs/dmat.rs @@ -164,7 +164,7 @@ impl DMat { /// The returned vector contains the matrix data in column-major order. #[inline] pub fn as_mut_vec(&mut self) -> &mut [N] { - self.mij.as_mut_slice() + &mut self.mij[..] } } @@ -217,7 +217,7 @@ impl Indexable<(usize, usize), N> for DMat { unsafe fn unsafe_set(&mut self, rowcol: (usize, usize), val: N) { let (row, col) = rowcol; let offset = self.offset(row, col); - *self.mij.as_mut_slice().get_unchecked_mut(offset) = val + *self.mij[..].get_unchecked_mut(offset) = val } /// Reads the value of a component of the matrix. @@ -249,7 +249,7 @@ impl Indexable<(usize, usize), N> for DMat { let count = self.mij.len(); assert!(offset1 < count); assert!(offset2 < count); - self.mij.as_mut_slice().swap(offset1, offset2); + self.mij[..].swap(offset1, offset2); } } @@ -282,7 +282,7 @@ impl IndexMut<(usize, usize)> for DMat { let offset = self.offset(i, j); unsafe { - self.mij.as_mut_slice().get_unchecked_mut(offset) + self.mij[..].get_unchecked_mut(offset) } } } @@ -407,8 +407,8 @@ impl Inv for DMat { let off_n0_j = self.offset(n0, j); let off_k_j = self.offset(k, j); - self.mij.as_mut_slice().swap(off_n0_j, off_k_j); - res.mij.as_mut_slice().swap(off_n0_j, off_k_j); + self.mij[..].swap(off_n0_j, off_k_j); + res.mij[..].swap(off_n0_j, off_k_j); } } @@ -482,7 +482,7 @@ impl Transpose for DMat { let off_i_j = self.offset(i, j); let off_j_i = self.offset(j, i); - self.mij.as_mut_slice().swap(off_i_j, off_j_i); + self.mij[..].swap(off_i_j, off_j_i); } } diff --git a/src/structs/dvec_macros.rs b/src/structs/dvec_macros.rs index 15bdef9c..60d8c86d 100644 --- a/src/structs/dvec_macros.rs +++ b/src/structs/dvec_macros.rs @@ -72,7 +72,7 @@ macro_rules! dvec_impl( #[inline] unsafe fn unsafe_set(&mut self, i: usize, val: N) { - *self.at.as_mut_slice().get_unchecked_mut(i) = val + *self.at[..].get_unchecked_mut(i) = val } } From df93ed2d1c2773ba91d08c5c4c9ef1f6c12df4e0 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Sun, 29 Mar 2015 13:00:09 +0200 Subject: [PATCH 2/2] Replace quoted crate declarations --- src/lib.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 7670f142..20938215 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,7 +24,7 @@ The preferred way to use **nalgebra** is to import types and traits explicitly, free-functions using the `na::` prefix: ```.rust -extern crate "nalgebra" as na; +extern crate nalgebra as na; use na::{Vec3, Rot3, Rotation}; fn main() { @@ -371,7 +371,7 @@ pub fn perspective3d + Zero + One>(width: N, height: N, /// Gets the translation applicable by `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Iso3}; /// /// fn main() { @@ -389,7 +389,7 @@ pub fn translation>(m: &M) -> V { /// Gets the inverse translation applicable by `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Iso3}; /// /// fn main() { @@ -417,7 +417,7 @@ pub fn append_translation>(m: &M, v: &V) -> M { /// Applies a translation to a point. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Pnt3, Vec3, Iso3}; /// /// fn main() { @@ -437,7 +437,7 @@ pub fn translate>(m: &M, p: &P) -> P { /// Applies an inverse translation to a point. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Pnt3, Vec3, Iso3}; /// /// fn main() { @@ -460,7 +460,7 @@ pub fn inv_translate>(m: &M, p: &P) -> P { /// Gets the rotation applicable by `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Rot3}; /// /// fn main() { @@ -478,7 +478,7 @@ pub fn rotation>(m: &M) -> V { /// Gets the inverse rotation applicable by `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Rot3}; /// /// fn main() { @@ -496,7 +496,7 @@ pub fn inv_rotation>(m: &M) -> V { /// Applies the rotation `v` to a copy of `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Rot3}; /// /// fn main() { @@ -516,7 +516,7 @@ pub fn append_rotation>(m: &M, v: &V) -> M { /// Pre-applies the rotation `v` to a copy of `m`. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{Vec3, Rot3}; /// /// fn main() { @@ -539,7 +539,7 @@ pub fn prepend_rotation>(m: &M, v: &V) -> M { /// Applies a rotation to a vector. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{BaseFloat, Rot3, Vec3}; /// /// fn main() { @@ -560,7 +560,7 @@ pub fn rotate>(m: &M, v: &V) -> V { /// Applies an inverse rotation to a vector. /// /// ```rust -/// extern crate "nalgebra" as na; +/// extern crate nalgebra as na; /// use na::{BaseFloat, Rot3, Vec3}; /// /// fn main() {