Clean up

concoct-rs · Dec 13, 2023 · 0c040e1 · 0c040e1
1 parent dc1d741
commit 0c040e1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -36,15 +36,10 @@ macro_rules! cfg_futures {
 }
 
 mod object;
-use core::any::Any;
-use core::marker::PhantomData;
-
-use handle::HandleGuard;
-
-pub use self::object::Object;
+pub use self::object::{AnyObject, Object};
 
 mod handle;
-pub use self::handle::Handle;
+pub use self::handle::{Handle, HandleGuard};
 
 cfg_rt!(
  pub mod rt;
@@ -65,29 +60,3 @@ pub trait Signal<M>: Object {
 pub trait Slot<M>: Object {
  fn handle(&mut self, cx: Handle<Self>, msg: M);
 }
-
-pub trait AnyObject {
- fn as_any(&self) -> &dyn Any;
-
- fn as_any_mut(&mut self) -> &mut dyn Any;
-
- fn start_any(&mut self, handle: HandleGuard);
-}
-
-impl<O: Object + 'static> AnyObject for O {
- fn as_any(&self) -> &dyn Any {
- self
- }
-
- fn as_any_mut(&mut self) -> &mut dyn Any {
- self
- }
-
- fn start_any(&mut self, handle: HandleGuard) {
- let handle = Handle {
- guard: handle,
- _marker: PhantomData,
- };
- self.start(handle)
- }
-}
diff --git a/src/object.rs b/src/object.rs
@@ -1,4 +1,7 @@
 use crate::Handle;
+use crate::handle::HandleGuard;
+use core::any::Any;
+use core::marker::PhantomData;
 
 pub trait Object {
  #[allow(unused_variables)]
@@ -13,3 +16,31 @@ pub trait Object {
  }
  );
 }
+
+
+pub trait AnyObject {
+ fn as_any(&self) -> &dyn Any;
+
+ fn as_any_mut(&mut self) -> &mut dyn Any;
+
+ fn start_any(&mut self, handle: HandleGuard);
+}
+
+impl<O: Object + 'static> AnyObject for O {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn as_any_mut(&mut self) -> &mut dyn Any {
+ self
+ }
+
+ fn start_any(&mut self, handle: HandleGuard) {
+ let handle = Handle {
+ guard: handle,
+ _marker: PhantomData,
+ };
+ self.start(handle)
+ }
+}
+