Unify error types ♾

3 files changed, 6 insertions, 6 deletions

diff --git a/src/library/align.rs b/src/library/align.rs
index 14e329e3..417d8f07 100644
--- a/src/library/align.rs
+++ b/src/library/align.rs
@@ -19,7 +19,7 @@ function! {
                 "vertical" => Key::Axis(AxisKey::Vertical),
                 "primary" => Key::Axis(AxisKey::Primary),
                 "secondary" => Key::Axis(AxisKey::Secondary),
-                _ => pr!("unexpected argument"),
+                _ => error!(unexpected_argument),
             };
 
             let value = AlignmentKey::parse(arg.val.1.val)?;
diff --git a/src/library/boxed.rs b/src/library/boxed.rs
index d4e39450..a2df45e3 100644
--- a/src/library/boxed.rs
+++ b/src/library/boxed.rs
@@ -17,7 +17,7 @@ function! {
                 "height" | "h" => AxisKey::Vertical,
                 "primary-size" => AxisKey::Primary,
                 "secondary-size" => AxisKey::Secondary,
-                _ => pr!("unexpected argument"),
+                _ => error!(unexpected_argument),
             };
 
             let size = ArgParser::convert::<ArgSize>(arg.val.1.val)?;
diff --git a/src/library/mod.rs b/src/library/mod.rs
index b09303bb..02af0d83 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -128,7 +128,7 @@ function! {
                 "vertical-origin" => AxisAligned(AxisKey::Vertical, Origin),
                 "vertical-end" => AxisAligned(AxisKey::Vertical, End),
 
-                _ => pr!("unexpected argument"),
+                _ => error!(unexpected_argument),
             };
 
             let size = ArgParser::convert::<ArgSize>(arg.val.1.val)?;
@@ -200,13 +200,13 @@ function! {
                     "vertical" => AxisKey::Vertical,
                     "primary" => AxisKey::Primary,
                     "secondary" => AxisKey::Secondary,
-                    _ => pr!("unexpected argument"),
+                    _ => error!(unexpected_argument),
                 };
 
                 let spacing = SpacingValue::from_expr(arg.val.1.val)?;
                 Spacing { axis, spacing }
             } else {
-                pr!("expected axis and expression")
+                error!("expected axis and expression")
             }
         };
 
@@ -236,7 +236,7 @@ impl SpacingValue {
         Ok(match expr.val {
             Expression::Size(s) => SpacingValue::Absolute(*s),
             Expression::Num(f) => SpacingValue::Relative(*f as f32),
-            _ => pr!("invalid spacing: expected size or number"),
+            _ => error!("invalid spacing: expected size or number"),
         })
     }
 }