Merge pull request #22 from tmtmtoo:component

refactor: relocate component trait

src/app.rs

@@ -5,13 +5,6 @@ mod supervise;
 pub use retry::*;
 pub use supervise::*;
 
-#[async_trait::async_trait]
-pub trait Component {
-    type Output;
-
-    async fn handle(&self) -> Self::Output;
-}
-
 pub enum Transition<N, D> {
     Next(N),
     Done(D),

src/app/components.rs

@@ -5,3 +5,10 @@ mod wait;
 pub use cmd_executor::*;
 pub use cmd_not_found::*;
 pub use wait::*;
+
+#[async_trait::async_trait]
+pub trait Component {
+    type Output;
+
+    async fn handle(&self) -> Self::Output;
+}

src/app/components/cmd_executor.rs

@@ -1,4 +1,3 @@
-use crate::app::*;
 use crate::io::*;
 
 #[derive(new)]
@@ -8,7 +7,7 @@ pub struct CmdExecutor {
 }
 
 #[async_trait::async_trait]
-impl Component for CmdExecutor {
+impl super::Component for CmdExecutor {
     type Output = anyhow::Result<Exit>;
 
     async fn handle(&self) -> Self::Output {

src/app/components/cmd_not_found.rs

@@ -1,13 +1,11 @@
-use crate::app::*;
-
 #[derive(new)]
 pub struct PrintableCmdNotFound<C> {
     pub command: String,
     pub inner: C,
 }
 
 #[async_trait::async_trait]
-impl<T: 'static, C: Component<Output = anyhow::Result<T>> + Send + Sync> Component
+impl<T: 'static, C: super::Component<Output = anyhow::Result<T>> + Send + Sync> super::Component
     for PrintableCmdNotFound<C>
 {
     type Output = anyhow::Result<T>;

src/app/components/wait.rs

@@ -1,4 +1,3 @@
-use crate::app::*;
 use crate::io::*;
 
 pub struct WaitSec {
@@ -7,7 +6,7 @@ pub struct WaitSec {
 }
 
 #[async_trait::async_trait]
-impl Component for WaitSec {
+impl super::Component for WaitSec {
     type Output = ();
 
     async fn handle(&self) -> Self::Output {