diff options
Diffstat (limited to 'src/geom')
| -rw-r--r-- | src/geom/align.rs | 4 | ||||
| -rw-r--r-- | src/geom/axes.rs | 2 | ||||
| -rw-r--r-- | src/geom/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/geom/align.rs b/src/geom/align.rs index dca35891..47acd3a6 100644 --- a/src/geom/align.rs +++ b/src/geom/align.rs @@ -216,7 +216,7 @@ cast! { self => self.0.into_value(), align: GenAlign => { if align.axis() != Axis::X { - Err("alignment must be horizontal")?; + bail!("alignment must be horizontal"); } Self(align) }, @@ -232,7 +232,7 @@ cast! { self => self.0.into_value(), align: GenAlign => { if align.axis() != Axis::Y { - Err("alignment must be vertical")?; + bail!("alignment must be vertical"); } Self(align) }, diff --git a/src/geom/axes.rs b/src/geom/axes.rs index 35c94129..059d3bb2 100644 --- a/src/geom/axes.rs +++ b/src/geom/axes.rs @@ -280,7 +280,7 @@ cast! { let mut iter = array.into_iter(); match (iter.next(), iter.next(), iter.next()) { (Some(a), Some(b), None) => Axes::new(a.cast()?, b.cast()?), - _ => Err("point array must contain exactly two entries")?, + _ => bail!("point array must contain exactly two entries"), } }, } diff --git a/src/geom/mod.rs b/src/geom/mod.rs index 4a9ecfe1..b7a7ff40 100644 --- a/src/geom/mod.rs +++ b/src/geom/mod.rs @@ -61,7 +61,7 @@ use std::hash::{Hash, Hasher}; use std::iter::Sum; use std::ops::*; -use crate::diag::StrResult; +use crate::diag::{bail, StrResult}; use crate::eval::{array, cast, Array, Dict, Value}; use crate::model::{Fold, Resolve, StyleChain}; |