From 9f27a925bd323e8e0864bedeb33a3c6953517ea1 Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 19 Nov 2022 15:45:12 +0100 Subject: refactor: reorganize non-public API items --- src/libs/intertrait/cast/arc.rs | 93 --------------------------------------- src/libs/intertrait/cast/box.rs | 87 ------------------------------------ src/libs/intertrait/cast/error.rs | 20 --------- src/libs/intertrait/cast/mod.rs | 20 --------- src/libs/intertrait/cast/rc.rs | 87 ------------------------------------ 5 files changed, 307 deletions(-) delete mode 100644 src/libs/intertrait/cast/arc.rs delete mode 100644 src/libs/intertrait/cast/box.rs delete mode 100644 src/libs/intertrait/cast/error.rs delete mode 100644 src/libs/intertrait/cast/mod.rs delete mode 100644 src/libs/intertrait/cast/rc.rs (limited to 'src/libs/intertrait/cast') diff --git a/src/libs/intertrait/cast/arc.rs b/src/libs/intertrait/cast/arc.rs deleted file mode 100644 index a1b2c30..0000000 --- a/src/libs/intertrait/cast/arc.rs +++ /dev/null @@ -1,93 +0,0 @@ -//! Originally from Intertrait by CodeChain -//! -//! -//! -//! -//! Licensed under either of -//! -//! Apache License, Version 2.0 (LICENSE-APACHE or ) -//! MIT license (LICENSE-MIT or ) -//! -//! at your option. -use std::any::type_name; -use std::sync::Arc; - -use crate::libs::intertrait::cast::error::CastError; -use crate::libs::intertrait::{get_caster, CastFromSync}; - -pub trait CastArc -{ - /// Casts an `Arc` with `Self` into an `Arc` with `Dest`. - fn cast(self: Arc) -> Result, CastError>; -} - -/// A blanket implementation of `CastArc` for traits extending `CastFrom`, `Sync`, and -/// `Send`. -impl CastArc for CastFromSelf -{ - fn cast(self: Arc) -> Result, CastError> - { - let caster = - get_caster::((*self).type_id()).map_err(CastError::GetCasterFailed)?; - - let cast_arc = caster - .opt_cast_arc - .ok_or(CastError::NotArcCastable(type_name::()))?; - - cast_arc(self.arc_any()).map_err(|err| CastError::CastFailed { - source: err, - from: type_name::(), - to: type_name::(), - }) - } -} - -#[cfg(test)] -mod tests -{ - use std::any::Any; - use std::fmt::{Debug, Display}; - use std::sync::Arc; - - use super::*; - use crate::test_utils::subjects; - - #[test] - fn can_cast_arc() - { - let concrete_ninja = Arc::new(subjects::Ninja); - - let abstract_ninja: Arc = concrete_ninja; - - let debug_ninja_result = abstract_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } - - #[test] - fn cannot_cast_arc_wrong() - { - let concrete_ninja = Arc::new(subjects::Ninja); - - let abstract_ninja: Arc = concrete_ninja; - - let display_ninja_result = abstract_ninja.cast::(); - - assert!(matches!( - display_ninja_result, - Err(CastError::GetCasterFailed(_)) - )); - } - - #[test] - fn can_cast_arc_from_any() - { - let concrete_ninja = Arc::new(subjects::Ninja); - - let any_ninja: Arc = concrete_ninja; - - let debug_ninja_result = any_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } -} diff --git a/src/libs/intertrait/cast/box.rs b/src/libs/intertrait/cast/box.rs deleted file mode 100644 index fcd5f70..0000000 --- a/src/libs/intertrait/cast/box.rs +++ /dev/null @@ -1,87 +0,0 @@ -//! Originally from Intertrait by CodeChain -//! -//! -//! -//! -//! Licensed under either of -//! -//! Apache License, Version 2.0 (LICENSE-APACHE or ) -//! MIT license (LICENSE-MIT or ) -//! -//! at your option. - -use std::any::type_name; - -use crate::libs::intertrait::cast::error::CastError; -use crate::libs::intertrait::{get_caster, CastFrom}; - -pub trait CastBox -{ - /// Casts a `Box` with `Self` into a `Box` with `Dest`. - fn cast(self: Box) -> Result, CastError>; -} - -/// A blanket implementation of `CastBox` for traits extending `CastFrom`. -impl CastBox for CastFromSelf -{ - fn cast(self: Box) -> Result, CastError> - { - let caster = - get_caster::((*self).type_id()).map_err(CastError::GetCasterFailed)?; - - (caster.cast_box)(self.box_any()).map_err(|err| CastError::CastFailed { - source: err, - from: type_name::(), - to: type_name::(), - }) - } -} - -#[cfg(test)] -mod tests -{ - use std::any::Any; - use std::fmt::{Debug, Display}; - - use super::*; - use crate::test_utils::subjects; - - #[test] - fn can_cast_box() - { - let concrete_ninja = Box::new(subjects::Ninja); - - let abstract_ninja: Box = concrete_ninja; - - let debug_ninja_result = abstract_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } - - #[test] - fn cannot_cast_box_wrong() - { - let concrete_ninja = Box::new(subjects::Ninja); - - let abstract_ninja: Box = concrete_ninja; - - let display_ninja_result = abstract_ninja.cast::(); - - assert!(matches!( - display_ninja_result, - Err(CastError::GetCasterFailed(_)) - )); - } - - #[test] - fn can_cast_box_from_any() - { - let concrete_ninja = Box::new(subjects::Ninja); - - let any_ninja: Box = concrete_ninja; - - let debug_ninja_result = any_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } -} diff --git a/src/libs/intertrait/cast/error.rs b/src/libs/intertrait/cast/error.rs deleted file mode 100644 index d253fc5..0000000 --- a/src/libs/intertrait/cast/error.rs +++ /dev/null @@ -1,20 +0,0 @@ -use crate::libs::intertrait::{CasterError, GetCasterError}; - -#[derive(thiserror::Error, Debug)] -pub enum CastError -{ - #[error("Failed to get caster")] - GetCasterFailed(#[from] GetCasterError), - - #[error("Failed to cast from {from} to {to}")] - CastFailed - { - #[source] - source: CasterError, - from: &'static str, - to: &'static str, - }, - - #[error("'{0}' can't be cast to an Arc")] - NotArcCastable(&'static str), -} diff --git a/src/libs/intertrait/cast/mod.rs b/src/libs/intertrait/cast/mod.rs deleted file mode 100644 index a0342cf..0000000 --- a/src/libs/intertrait/cast/mod.rs +++ /dev/null @@ -1,20 +0,0 @@ -//! Originally from Intertrait by CodeChain -//! -//! -//! -//! -//! Licensed under either of -//! -//! Apache License, Version 2.0 (LICENSE-APACHE or ) -//! MIT license (LICENSE-MIT or ) -//! -//! at your option. -pub mod error; - -mod arc; -mod r#box; -mod rc; - -pub use arc::*; -pub use r#box::*; -pub use rc::*; diff --git a/src/libs/intertrait/cast/rc.rs b/src/libs/intertrait/cast/rc.rs deleted file mode 100644 index 8567d1e..0000000 --- a/src/libs/intertrait/cast/rc.rs +++ /dev/null @@ -1,87 +0,0 @@ -//! Originally from Intertrait by CodeChain -//! -//! -//! -//! -//! Licensed under either of -//! -//! Apache License, Version 2.0 (LICENSE-APACHE or ) -//! MIT license (LICENSE-MIT or ) -//! -//! at your option. -use std::any::type_name; -use std::rc::Rc; - -use crate::libs::intertrait::cast::error::CastError; -use crate::libs::intertrait::{get_caster, CastFrom}; - -pub trait CastRc -{ - /// Casts an `Rc` with `Self `into a `Rc` with `Dest`. - fn cast(self: Rc) -> Result, CastError>; -} - -/// A blanket implementation of `CastRc` for traits extending `CastFrom`. -impl CastRc for CastFromSelf -{ - fn cast(self: Rc) -> Result, CastError> - { - let caster = - get_caster::((*self).type_id()).map_err(CastError::GetCasterFailed)?; - - (caster.cast_rc)(self.rc_any()).map_err(|err| CastError::CastFailed { - source: err, - from: type_name::(), - to: type_name::(), - }) - } -} - -#[cfg(test)] -mod tests -{ - use std::any::Any; - use std::fmt::{Debug, Display}; - - use super::*; - use crate::test_utils::subjects; - - #[test] - fn can_cast_rc() - { - let concrete_ninja = Rc::new(subjects::Ninja); - - let abstract_ninja: Rc = concrete_ninja; - - let debug_ninja_result = abstract_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } - - #[test] - fn cannot_cast_rc_wrong() - { - let concrete_ninja = Rc::new(subjects::Ninja); - - let abstract_ninja: Rc = concrete_ninja; - - let display_ninja_result = abstract_ninja.cast::(); - - assert!(matches!( - display_ninja_result, - Err(CastError::GetCasterFailed(_)) - )); - } - - #[test] - fn can_cast_rc_from_any() - { - let concrete_ninja = Rc::new(subjects::Ninja); - - let any_ninja: Rc = concrete_ninja; - - let debug_ninja_result = any_ninja.cast::(); - - assert!(debug_ninja_result.is_ok()); - } -} -- cgit v1.2.3-18-g5258