From 9da5b5e2d8723f581e3681f8297eff41e3c237e6 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 6 Jun 2023 11:18:06 +0200 Subject: [PATCH] Add `fj::Result` --- crates/fj/src/handle_model.rs | 5 ++++- crates/fj/src/lib.rs | 2 +- models/cuboid/src/main.rs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/fj/src/handle_model.rs b/crates/fj/src/handle_model.rs index 9c90b056f..5fca60f3e 100644 --- a/crates/fj/src/handle_model.rs +++ b/crates/fj/src/handle_model.rs @@ -15,7 +15,7 @@ use crate::Args; pub fn handle_model( model: impl Deref, tolerance: impl Into, -) -> Result<(), Error> +) -> Result where for<'r> (&'r Model, Tolerance): Triangulate, { @@ -31,6 +31,9 @@ where Ok(()) } +/// Return value of [`handle_model`] +pub type Result = std::result::Result<(), Error>; + /// Error returned by [`handle_model`] #[derive(Debug, thiserror::Error)] pub enum Error { diff --git a/crates/fj/src/lib.rs b/crates/fj/src/lib.rs index dc2ca7640..8224c3599 100644 --- a/crates/fj/src/lib.rs +++ b/crates/fj/src/lib.rs @@ -16,7 +16,7 @@ mod handle_model; pub use self::{ args::Args, - handle_model::{handle_model, Error}, + handle_model::{handle_model, Error, Result}, }; pub use fj_core as core; diff --git a/models/cuboid/src/main.rs b/models/cuboid/src/main.rs index d0209251e..3fbe0d285 100644 --- a/models/cuboid/src/main.rs +++ b/models/cuboid/src/main.rs @@ -1,6 +1,6 @@ use fj::handle_model; -fn main() -> Result<(), fj::Error> { +fn main() -> fj::Result { let cuboid = cuboid::cuboid(3., 2., 1.); // The tolerance makes no difference for this model, as there aren't any