M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use slicing syntax instead of deprecated methods

This commit is contained in:
Eduard Bopp 2015-03-29 12:57:16 +02:00
parent 8776963e91
commit ec5ece46ca
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/structs/dmat.rs
View File

@ -164,7 +164,7 @@ impl<N> DMat<N> {
/// The returned vector contains the matrix data in column-major order. /// The returned vector contains the matrix data in column-major order.
#[inline] #[inline]
pub fn as_mut_vec(&mut self) -> &mut [N] { pub fn as_mut_vec(&mut self) -> &mut [N] {
self.mij.as_mut_slice() &mut self.mij[..]
} }
} }
@ -217,7 +217,7 @@ impl<N: Copy> Indexable<(usize, usize), N> for DMat<N> {
unsafe fn unsafe_set(&mut self, rowcol: (usize, usize), val: N) { unsafe fn unsafe_set(&mut self, rowcol: (usize, usize), val: N) {
let (row, col) = rowcol; let (row, col) = rowcol;
let offset = self.offset(row, col); 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. /// Reads the value of a component of the matrix.
@ -249,7 +249,7 @@ impl<N: Copy> Indexable<(usize, usize), N> for DMat<N> {
let count = self.mij.len(); let count = self.mij.len();
assert!(offset1 < count); assert!(offset1 < count);
assert!(offset2 < count); assert!(offset2 < count);
self.mij.as_mut_slice().swap(offset1, offset2); self.mij[..].swap(offset1, offset2);
} }
} }
@ -282,7 +282,7 @@ impl<N> IndexMut<(usize, usize)> for DMat<N> {
let offset = self.offset(i, j); let offset = self.offset(i, j);
unsafe { unsafe {
self.mij.as_mut_slice().get_unchecked_mut(offset) self.mij[..].get_unchecked_mut(offset)
} }
} }
} }
@ -407,8 +407,8 @@ impl<N: BaseNum + Clone> Inv for DMat<N> {
let off_n0_j = self.offset(n0, j); let off_n0_j = self.offset(n0, j);
let off_k_j = self.offset(k, j); let off_k_j = self.offset(k, j);
self.mij.as_mut_slice().swap(off_n0_j, off_k_j); self.mij[..].swap(off_n0_j, off_k_j);
res.mij.as_mut_slice().swap(off_n0_j, off_k_j); res.mij[..].swap(off_n0_j, off_k_j);
} }
} }
@ -482,7 +482,7 @@ impl<N: Clone + Copy> Transpose for DMat<N> {
let off_i_j = self.offset(i, j); let off_i_j = self.offset(i, j);
let off_j_i = self.offset(j, i); 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);
} }
} }

2
src/structs/dvec_macros.rs
View File

@ -72,7 +72,7 @@ macro_rules! dvec_impl(
#[inline] #[inline]
unsafe fn unsafe_set(&mut self, i: usize, val: N) { 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
} }
} }