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

Add into_vec() method and format code

Browse source
This commit is contained in:
Junfeng Liu 2021-05-25 15:12:41 +08:00
parent 5986be422c
commit 15a734751c
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/lib.rs
View file

@ -617,7 +617,12 @@ impl<T: Clone> Grid<T> {
/// assert_eq!(flat, &vec![1,2,3,4,5,6]); /// assert_eq!(flat, &vec![1,2,3,4,5,6]);
/// ``` /// ```
pub fn flatten(&self) -> &Vec<T> { pub fn flatten(&self) -> &Vec<T> {
return &self.data &self.data
}
/// Converts self into a vector without clones or allocation.
pub fn into_vec(self) -> Vec<T> {
self.data
} }
} }
@ -682,8 +687,8 @@ mod test {
fn insert_col_at_end() { fn insert_col_at_end() {
let mut grid: Grid<u8> = Grid::from_vec(vec![1, 2, 3, 4], 2); let mut grid: Grid<u8> = Grid::from_vec(vec![1, 2, 3, 4], 2);
grid.insert_col(2, vec![5, 6]); grid.insert_col(2, vec![5, 6]);
assert_eq!(grid[0], [1 ,2, 5]); assert_eq!(grid[0], [1, 2, 5]);
assert_eq!(grid[1], [3 ,4, 6]); assert_eq!(grid[1], [3, 4, 6]);
} }
#[test] #[test]
@ -693,14 +698,13 @@ mod test {
grid.insert_col(3, vec![4, 5]); grid.insert_col(3, vec![4, 5]);
} }
#[test] #[test]
fn insert_row_at_end() { fn insert_row_at_end() {
let mut grid: Grid<u8> = Grid::from_vec(vec![1, 2, 3, 4], 2); let mut grid: Grid<u8> = Grid::from_vec(vec![1, 2, 3, 4], 2);
grid.insert_row(2, vec![5, 6]); grid.insert_row(2, vec![5, 6]);
assert_eq!(grid[0], [1 ,2]); assert_eq!(grid[0], [1, 2]);
assert_eq!(grid[1], [3 ,4]); assert_eq!(grid[1], [3, 4]);
assert_eq!(grid[2], [5 ,6]); assert_eq!(grid[2], [5, 6]);
} }
#[test] #[test]