technofab/aerosol
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/aerosol.git synced 2026-02-02 01:15:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow anyhow::Error as Error type

Browse source
This commit is contained in:
Diggory Blake 2023-07-02 15:33:45 +01:00
parent 489b5d04d8
commit 079fbb4654
No known key found for this signature in database
GPG key ID: E6BDFA83146ABD40
4 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/async_constructible.rs
View file

@ -1,4 +1,4 @@
use std::{error::Error, sync::Arc};
use std::sync::Arc;
use async_trait::async_trait;
@ -14,7 +14,7 @@ use crate::{
#[async_trait]
pub trait AsyncConstructible: Sized {
/// Error type for when resource fails to be constructed.
type Error: Error + Send + Sync;
type Error: Into<anyhow::Error> + Send + Sync;
/// Construct the resource with the provided application state.
async fn construct_async(aero: &Aerosol) -> Result<Self, Self::Error>;
}
@ -32,7 +32,7 @@ impl<T: Constructible> AsyncConstructible for T {
#[async_trait]
pub trait IndirectlyAsyncConstructible: Sized {
/// Error type for when resource fails to be constructed.
type Error: Error + Send + Sync;
type Error: Into<anyhow::Error> + Send + Sync;
/// Construct the resource with the provided application state.
async fn construct_async(aero: &Aerosol) -> Result<Self, Self::Error>;
}

9
src/resource.rs
View file

@ -1,7 +1,4 @@
use std::{
any::{type_name, Any},
error::Error,
};
use std::any::{type_name, Any};
/// Bound on the types that can be used as an aerosol resource.
pub trait Resource: Any + Send + Sync + Clone {}
@ -15,10 +12,10 @@ pub(crate) fn unwrap_resource<T: Resource>(opt: Option<T>) -> T {
}
}
pub(crate) fn unwrap_constructed<T: Resource, U>(res: Result<U, impl Error>) -> U {
pub(crate) fn unwrap_constructed<T: Resource, U>(res: Result<U, impl Into<anyhow::Error>>) -> U {
match res {
Ok(x) => x,
Err(e) => panic!("Failed to construct `{}`: {}", type_name::<T>(), e),
Err(e) => panic!("Failed to construct `{}`: {}", type_name::<T>(), e.into()),
}
}

6
src/sync_constructible.rs
View file

@ -1,4 +1,4 @@
use std::{error::Error, sync::Arc};
use std::sync::Arc;
use crate::{
resource::{unwrap_constructed, Resource},
@ -9,7 +9,7 @@ use crate::{
/// Implemented for values which can be constructed from other resources.
pub trait Constructible: Sized {
/// Error type for when resource fails to be constructed.
type Error: Error + Send + Sync;
type Error: Into<anyhow::Error> + Send + Sync;
/// Construct the resource with the provided application state.
fn construct(aero: &Aerosol) -> Result<Self, Self::Error>;
}
@ -17,7 +17,7 @@ pub trait Constructible: Sized {
/// Automatically implemented for values which can be indirectly constructed from other resources.
pub trait IndirectlyConstructible: Sized {
/// Error type for when resource fails to be constructed.
type Error: Error + Send + Sync;
type Error: Into<anyhow::Error> + Send + Sync;
/// Construct the resource with the provided application state.
fn construct(aero: &Aerosol) -> Result<Self, Self::Error>;
}