Skip to content

Call unwrap in macros #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siliconlad wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Call unwrap in macros #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/coordinate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ macro_rules! coord {
($($index:expr),*) => {
{
use $crate::coordinate::Coordinate;
Coordinate::new(vec![$($index),*])
Coordinate::new(vec![$($index),*]).unwrap()
}
};

($index:expr; $count:expr) => {
{
use $crate::coordinate::Coordinate;
Coordinate::new(vec![$index; $count])
Coordinate::new(vec![$index; $count]).unwrap()
}
};
}
Expand All @@ -78,13 +78,13 @@ mod tests {

#[test]
fn test_order() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
assert_eq!(coord.order(), 3);
}

#[test]
fn test_iter() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
let mut iter = coord.iter();
assert_eq!(iter.next(), Some(&1));
assert_eq!(iter.next(), Some(&2));
Expand All @@ -94,38 +94,38 @@ mod tests {

#[test]
fn test_insert() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
let new_coord = coord.insert(1, 4);
assert_eq!(new_coord, coord![1, 4, 2, 3].unwrap());
assert_eq!(new_coord, coord![1, 4, 2, 3]);
}

#[test]
fn test_index() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
assert_eq!(coord[0], 1);
assert_eq!(coord[1], 2);
assert_eq!(coord[2], 3);
}

#[test]
fn test_index_mut() {
let mut coord = coord![1, 2, 3].unwrap();
let mut coord = coord![1, 2, 3];
coord[1] = 4;
assert_eq!(coord[1], 4);
}

#[test]
fn test_display() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
assert_eq!(format!("{}", coord), "(1, 2, 3)");
}

#[test]
fn test_coord_macro() {
let coord = coord![1, 2, 3].unwrap();
let coord = coord![1, 2, 3];
assert_eq!(coord, Coordinate::new(vec![1, 2, 3]).unwrap());

let coord_repeated = coord![1; 3].unwrap();
let coord_repeated = coord![1; 3];
assert_eq!(coord_repeated, Coordinate::new(vec![1, 1, 1]).unwrap());
}
}
28 changes: 14 additions & 14 deletions src/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub struct IndexIterator {
impl IndexIterator {
pub fn new(shape: &Shape) -> Self {
// (shape.order() == 0) => `next` returns None before `current` is used
let current = coord![0; max(shape.order(), 1)].unwrap();
let current = coord![0; max(shape.order(), 1)];
IndexIterator {
shape: shape.clone(),
current,
Expand Down Expand Up @@ -54,33 +54,33 @@ mod tests {

#[test]
fn test_index_iterator() {
let shape = shape![2, 3].unwrap();
let shape = shape![2, 3];
let mut iter = IndexIterator::new(&shape);

assert_eq!(iter.next(), Some(coord![0, 0].unwrap()));
assert_eq!(iter.next(), Some(coord![0, 1].unwrap()));
assert_eq!(iter.next(), Some(coord![0, 2].unwrap()));
assert_eq!(iter.next(), Some(coord![1, 0].unwrap()));
assert_eq!(iter.next(), Some(coord![1, 1].unwrap()));
assert_eq!(iter.next(), Some(coord![1, 2].unwrap()));
assert_eq!(iter.next(), Some(coord![0, 0]));
assert_eq!(iter.next(), Some(coord![0, 1]));
assert_eq!(iter.next(), Some(coord![0, 2]));
assert_eq!(iter.next(), Some(coord![1, 0]));
assert_eq!(iter.next(), Some(coord![1, 1]));
assert_eq!(iter.next(), Some(coord![1, 2]));
assert_eq!(iter.next(), None);
}

#[test]
fn test_index_iterator_single_dimension() {
let shape = shape![4].unwrap();
let shape = shape![4];
let mut iter = IndexIterator::new(&shape);

assert_eq!(iter.next(), Some(coord![0].unwrap()));
assert_eq!(iter.next(), Some(coord![1].unwrap()));
assert_eq!(iter.next(), Some(coord![2].unwrap()));
assert_eq!(iter.next(), Some(coord![3].unwrap()));
assert_eq!(iter.next(), Some(coord![0]));
assert_eq!(iter.next(), Some(coord![1]));
assert_eq!(iter.next(), Some(coord![2]));
assert_eq!(iter.next(), Some(coord![3]));
assert_eq!(iter.next(), None);
}

#[test]
fn test_index_iterator_empty_tensor() {
let shape = shape![].unwrap();
let shape = shape![];
let mut iter = IndexIterator::new(&shape);

assert_eq!(iter.next(), None);
Expand Down
Loading