diff options
Diffstat (limited to 'library/src/compute')
| -rw-r--r-- | library/src/compute/construct.rs | 8 | ||||
| -rw-r--r-- | library/src/compute/data.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/library/src/compute/construct.rs b/library/src/compute/construct.rs index 5ccefb18..cbb50fd6 100644 --- a/library/src/compute/construct.rs +++ b/library/src/compute/construct.rs @@ -171,12 +171,12 @@ cast! { Component, v: i64 => match v { 0 ..= 255 => Self(v as u8), - _ => Err("number must be between 0 and 255")?, + _ => bail!("number must be between 0 and 255"), }, v: Ratio => if (0.0 ..= 1.0).contains(&v.get()) { Self((v.get() * 255.0).round() as u8) } else { - Err("ratio must be between 0% and 100%")? + bail!("ratio must be between 0% and 100%"); }, } @@ -375,7 +375,7 @@ cast! { v: Ratio => if (0.0 ..= 1.0).contains(&v.get()) { Self((v.get() * 255.0).round() as u8) } else { - Err("ratio must be between 0% and 100%")? + bail!("ratio must be between 0% and 100%"); }, } @@ -437,7 +437,7 @@ cast! { let mut iter = array.into_iter(); match (iter.next(), iter.next(), iter.next()) { (Some(a), Some(b), None) => Self(a.cast()?, b.cast()?), - _ => Err("point array must contain exactly two entries")?, + _ => bail!("point array must contain exactly two entries"), } }, } diff --git a/library/src/compute/data.rs b/library/src/compute/data.rs index 1238c3c3..0d4d4865 100644 --- a/library/src/compute/data.rs +++ b/library/src/compute/data.rs @@ -105,11 +105,11 @@ cast! { let mut chars = v.chars(); let first = chars.next().ok_or("delimiter must not be empty")?; if chars.next().is_some() { - Err("delimiter must be a single character")? + bail!("delimiter must be a single character"); } if !first.is_ascii() { - Err("delimiter must be an ASCII character")? + bail!("delimiter must be an ASCII character"); } Self(first) |