--wip-- [skip ci]

examples/full/src/app.rs

@@ -35,7 +35,7 @@ impl RoadsterApp<AppContext> for App {
             .build())
     }
 
-    async fn provide_state(_context: AppContext) -> RoadsterResult<Self::State> {
+    async fn provide_state(_context: AppContext) -> RoadsterResult<AppContext> {
         Ok(_context)
     }
 

examples/full/src/cli/mod.rs

@@ -1,13 +1,10 @@
+use crate::app::App;
 use async_trait::async_trait;
 use clap::{Parser, Subcommand};
-use roadster::app::context::AppContext;
-
 use roadster::api::cli::RunCommand;
+use roadster::app::context::AppContext;
 use roadster::error::RoadsterResult;
 
-use crate::app::App;
-use crate::app_state::CustomAppContext;
-
 /// Full Example: Commands specific to managing the `full` app are provided in the CLI
 /// as well. Subcommands not listed under the `roadster` subcommand are specific to `full`.
 #[derive(Debug, Parser)]
@@ -19,14 +16,9 @@ pub struct AppCli {
 }
 
 #[async_trait]
-impl RunCommand<App> for AppCli {
+impl RunCommand<App, AppContext> for AppCli {
     #[allow(clippy::disallowed_types)]
-    async fn run(
-        &self,
-        app: &App,
-        cli: &AppCli,
-        context: &AppContext<CustomAppContext>,
-    ) -> RoadsterResult<bool> {
+    async fn run(&self, app: &App, cli: &AppCli, context: &AppContext) -> RoadsterResult<bool> {
         if let Some(command) = self.command.as_ref() {
             command.run(app, cli, context).await
         } else {
@@ -42,13 +34,8 @@ impl RunCommand<App> for AppCli {
 pub enum AppCommand {}
 
 #[async_trait]
-impl RunCommand<App> for AppCommand {
-    async fn run(
-        &self,
-        _app: &App,
-        _cli: &AppCli,
-        _context: &AppContext<CustomAppContext>,
-    ) -> RoadsterResult<bool> {
+impl RunCommand<App, AppContext> for AppCommand {
+    async fn run(&self, _app: &App, _cli: &AppCli, _context: &AppContext) -> RoadsterResult<bool> {
         Ok(false)
     }
 }

examples/full/src/worker/example.rs

@@ -1,4 +1,3 @@
-use crate::app::App;
 use async_trait::async_trait;
 use roadster::app::context::AppContext;
 use roadster::service::worker::sidekiq::app_worker::AppWorker;
@@ -17,7 +16,7 @@ impl Worker<String> for ExampleWorker {
 }
 
 #[async_trait]
-impl AppWorker<_, String> for ExampleWorker {
+impl AppWorker<AppContext, String> for ExampleWorker {
     fn build(_context: &AppContext) -> Self {
         Self {}
     }

src/service/http/service.rs

@@ -109,11 +109,10 @@ where
 
 impl HttpService {
     /// Create a new [HttpServiceBuilder].
-    pub fn builder<A, S>(path_root: Option<&str>, context: &S) -> HttpServiceBuilder<S>
+    pub fn builder<S>(path_root: Option<&str>, context: &S) -> HttpServiceBuilder<S>
     where
         S: Clone + Send + Sync + 'static,
         AppContext: FromRef<S>,
-        A: App<S>,
     {
         HttpServiceBuilder::new(path_root, context)
     }