isolated enum cast crate

Author: wzli

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = [
   "dynamic_plan_tree",
-  "dynamic_plan_tree_derive",
+  "enum_cast",
+  "enum_cast_derive",
 ]

dynamic_plan_tree/Cargo.toml

@@ -3,10 +3,8 @@ name = "dynamic_plan_tree"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-dynamic_plan_tree_derive = { path = "../dynamic_plan_tree_derive" }
+enum_cast = { path = "../enum_cast" }
 enum_dispatch = "0.3"
 rayon = { version = "1.5", optional = true }
 serde = { version = "1.0", features = ["derive"]}

dynamic_plan_tree/src/lib.rs

@@ -1,5 +1,5 @@
 pub use behaviour::Behaviour;
-pub use dynamic_plan_tree_derive::EnumCast;
+pub use enum_cast::*;
 pub use enum_dispatch::enum_dispatch;
 pub use plan::*;
 pub use predicate::Predicate;

dynamic_plan_tree/src/plan.rs

@@ -20,30 +20,6 @@ pub trait Config: Sized + 'static {
     type Behaviour: Behaviour<Self> + Serialize + DeserializeOwned + EnumCast;
 }
 
-pub trait EnumRef<T> {
-    fn enum_ref(&self) -> Option<&T>;
-    fn enum_mut(&mut self) -> Option<&mut T>;
-}
-
-pub trait EnumCast {
-    fn cast<T: 'static>(&self) -> Option<&T>;
-    fn cast_mut<T: 'static>(&mut self) -> Option<&mut T>;
-    fn from_any<T: 'static>(t: T) -> Option<Self>
-    where
-        Self: Sized;
-}
-
-pub trait IntoEnum {
-    fn into_enum<T: EnumCast>(self) -> Option<T>
-    where
-        Self: 'static + Sized,
-    {
-        T::from_any(self)
-    }
-}
-
-impl<T> IntoEnum for T {}
-
 /// Transition from `src` plans to `dst` plans within the parent plan upon the result of `predicate` evaluation.
 #[derive(Serialize, Deserialize)]
 pub struct Transition<P> {

enum_cast/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "enum_cast"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+enum_cast_derive = { path = "../enum_cast_derive" }

enum_cast/src/lib.rs

@@ -0,0 +1,25 @@
+pub use enum_cast_derive::EnumCast;
+
+pub trait EnumRef<T> {
+    fn enum_ref(&self) -> Option<&T>;
+    fn enum_mut(&mut self) -> Option<&mut T>;
+}
+
+pub trait EnumCast {
+    fn cast<T: 'static>(&self) -> Option<&T>;
+    fn cast_mut<T: 'static>(&mut self) -> Option<&mut T>;
+    fn from_any<T: 'static>(t: T) -> Option<Self>
+    where
+        Self: Sized;
+}
+
+pub trait IntoEnum {
+    fn into_enum<T: EnumCast>(self) -> Option<T>
+    where
+        Self: 'static + Sized,
+    {
+        T::from_any(self)
+    }
+}
+
+impl<T> IntoEnum for T {}

dynamic_plan_tree_derive/Cargo.toml renamed to enum_cast_derive/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "dynamic_plan_tree_derive"
+name = "enum_cast_derive"
 version = "0.1.0"
 edition = "2021"
 

dynamic_plan_tree_derive/src/lib.rs renamed to enum_cast_derive/src/lib.rs

@@ -22,7 +22,7 @@ pub fn enum_cast_derive(input: TokenStream) -> TokenStream {
 
             quote! {
                 #(
-                    impl #impl_generics EnumRef<#fields> for  #name #ty_generics #where_clause {
+                    impl #impl_generics enum_cast::EnumRef<#fields> for  #name #ty_generics #where_clause {
                         fn enum_ref(&self) -> Option<&#fields> {
                             match self {
                                 Self::#idents(x) => Some(x),
@@ -38,7 +38,7 @@ pub fn enum_cast_derive(input: TokenStream) -> TokenStream {
                     }
                 )*
 
-                impl #impl_generics EnumCast for #name #ty_generics #where_clause {
+                impl #impl_generics enum_cast::EnumCast for #name #ty_generics #where_clause {
                     fn cast<T: 'static>(&self) -> Option<&T> {
                         match self {
                             #(
@@ -70,7 +70,7 @@ pub fn enum_cast_derive(input: TokenStream) -> TokenStream {
         }
         Data::Struct(_) => {
             quote! {
-                impl #impl_generics EnumCast for #name #ty_generics #where_clause {
+                impl #impl_generics enum_cast::EnumCast for #name #ty_generics #where_clause {
                     fn cast<T: 'static>(&self) -> Option<&T> {
                         (self as &dyn std::any::Any).downcast_ref::<T>()
                     }