djkato/grid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clippy hints

Browse source
This commit is contained in:
Armin 2021-08-22 19:27:46 +02:00
parent dd86e573e8
commit b2436b8c0a
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/lib.rs
View file

@ -141,8 +141,8 @@ impl<T: Clone> Grid<T> {
} }
Grid { Grid {
data: vec![T::default(); rows * cols], data: vec![T::default(); rows * cols],
cols: cols, cols,
rows: rows, rows,
} }
} }
@ -153,8 +153,8 @@ impl<T: Clone> Grid<T> {
} }
Grid { Grid {
data: vec![data; rows * cols], data: vec![data; rows * cols],
cols: cols, cols,
rows: rows, rows,
} }
} }
@ -183,11 +183,11 @@ impl<T: Clone> Grid<T> {
let rows = vec.len(); let rows = vec.len();
if rows == 0 { if rows == 0 {
if cols == 0 { if cols == 0 {
return Grid { Grid {
data: vec![], data: vec![],
rows: 0, rows: 0,
cols: 0, cols: 0,
}; }
} else { } else {
panic!("Vector length is zero, but cols is {:?}", cols); panic!("Vector length is zero, but cols is {:?}", cols);
} }
@ -197,13 +197,16 @@ impl<T: Clone> Grid<T> {
Grid { Grid {
data: vec, data: vec,
rows: rows / cols, rows: rows / cols,
cols: cols, cols,
} }
} }
} }
/// Returns a reference to an element, without performing bound checks. /// Returns a reference to an element, without performing bound checks.
/// Generally not recommended, use with caution! /// Generally not recommended, use with caution!
///
/// # Safety
///
/// Calling this method with an out-of-bounds index is undefined behavior even if the resulting reference is not used. /// Calling this method with an out-of-bounds index is undefined behavior even if the resulting reference is not used.
#[inline] #[inline]
pub unsafe fn get_unchecked(&self, row: usize, col: usize) -> &T { pub unsafe fn get_unchecked(&self, row: usize, col: usize) -> &T {
@ -212,6 +215,9 @@ impl<T: Clone> Grid<T> {
/// Returns a mutable reference to an element, without performing bound checks. /// Returns a mutable reference to an element, without performing bound checks.
/// Generally not recommended, use with caution! /// Generally not recommended, use with caution!
///
/// # Safety
///
/// Calling this method with an out-of-bounds index is undefined behavior even if the resulting reference is not used. /// Calling this method with an out-of-bounds index is undefined behavior even if the resulting reference is not used.
#[inline] #[inline]
pub unsafe fn get_unchecked_mut(&mut self, row: usize, col: usize) -> &mut T { pub unsafe fn get_unchecked_mut(&mut self, row: usize, col: usize) -> &mut T {
@ -377,7 +383,7 @@ impl<T: Clone> Grid<T> {
pub fn iter_row(&self, row: usize) -> Iter<T> { pub fn iter_row(&self, row: usize) -> Iter<T> {
if row < self.rows { if row < self.rows {
let start = row * self.cols; let start = row * self.cols;
return self.data[start..(start + self.cols)].iter(); self.data[start..(start + self.cols)].iter()
} else { } else {
panic!( panic!(
"out of bounds. Row must be less than {:?}, but is {:?}.", "out of bounds. Row must be less than {:?}, but is {:?}.",
@ -406,7 +412,7 @@ impl<T: Clone> Grid<T> {
if row < self.rows { if row < self.rows {
let cols = self.cols; let cols = self.cols;
let start = row * cols; let start = row * cols;
return self.data[start..(start + cols)].iter_mut(); self.data[start..(start + cols)].iter_mut()
} else { } else {
panic!( panic!(
"out of bounds. Row must be less than {:?}, but is {:?}.", "out of bounds. Row must be less than {:?}, but is {:?}.",
@ -522,9 +528,9 @@ impl<T: Clone> Grid<T> {
if self.rows == 0 { if self.rows == 0 {
self.cols = 0; self.cols = 0;
} }
return Some(row); Some(row)
} else { } else {
return None; None
} }
} }
@ -553,9 +559,9 @@ impl<T: Clone> Grid<T> {
if self.cols == 0 { if self.cols == 0 {
self.rows = 0; self.rows = 0;
} }
return Some(col); Some(col)
} else { } else {
return None; None
} }
} }
@ -676,7 +682,7 @@ impl<T: Clone> Index<usize> for Grid<T> {
impl<T: Clone> IndexMut<usize> for Grid<T> { impl<T: Clone> IndexMut<usize> for Grid<T> {
fn index_mut(&mut self, idx: usize) -> &mut Self::Output { fn index_mut(&mut self, idx: usize) -> &mut Self::Output {
&mut self.data[(idx * &self.cols)..] &mut self.data[(idx * self.cols)..]
} }
} }
@ -832,11 +838,11 @@ mod test {
grid.push_col(vec![3, 13]); grid.push_col(vec![3, 13]);
assert_eq!(grid.size(), (2, 4)); assert_eq!(grid.size(), (2, 4));
assert_eq!( assert_eq!(
grid.iter_row(0).map(|x| *x).collect::<Vec<_>>(), grid.iter_row(0).copied().collect::<Vec<_>>(),
vec![0, 1, 2, 3] vec![0, 1, 2, 3]
); );
assert_eq!( assert_eq!(
grid.iter_row(1).map(|x| *x).collect::<Vec<_>>(), grid.iter_row(1).copied().collect::<Vec<_>>(),
vec![10, 11, 12, 13] vec![10, 11, 12, 13]
); );
} }
@ -850,15 +856,15 @@ mod test {
grid.push_col(vec!['x', 'y', 'z']); grid.push_col(vec!['x', 'y', 'z']);
assert_eq!(grid.size(), (3, 5)); assert_eq!(grid.size(), (3, 5));
assert_eq!( assert_eq!(
grid.iter_row(0).map(|x| *x).collect::<Vec<_>>(), grid.iter_row(0).copied().collect::<Vec<_>>(),
vec!['a', 'b', 'c', 'd', 'x'] vec!['a', 'b', 'c', 'd', 'x']
); );
assert_eq!( assert_eq!(
grid.iter_row(1).map(|x| *x).collect::<Vec<_>>(), grid.iter_row(1).copied().collect::<Vec<_>>(),
vec!['a', 'b', 'c', 'd', 'y'] vec!['a', 'b', 'c', 'd', 'y']
); );
assert_eq!( assert_eq!(
grid.iter_row(2).map(|x| *x).collect::<Vec<_>>(), grid.iter_row(2).copied().collect::<Vec<_>>(),
vec!['a', 'b', 'c', 'd', 'z'] vec!['a', 'b', 'c', 'd', 'z']
); );
} }