feat!: Allow http::Middleware trait to return custom errors (#933)

Add `Error` associated type to the `http::Middleware` trait to allow
consumers to return a custom error from their `http::Middleware`
implementations.

This PR also changes all trait/lifetime bounds to put `'static + Send +
Sync` first (omitting any that aren't necessary) instead of putting them
at the end.

Relates to #922

Author: spencewenski

src/api/cli/mod.rs

@@ -15,9 +15,9 @@ pub mod roadster;
 #[non_exhaustive]
 pub struct CliState<A, S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
-    A: App<S> + Sync + 'static,
+    A: 'static + Sync + App<S>,
 {
     pub roadster_cli: RoadsterCli,
     pub app_cli: A::Cli,
@@ -32,7 +32,7 @@ where
 #[async_trait]
 pub trait RunCommand<A, S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S> + Sync,
 {
@@ -52,7 +52,7 @@ where
 
 pub(crate) fn parse_cli<A, S, I, T>(args: I) -> RoadsterResult<(RoadsterCli, A::Cli)>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
     I: IntoIterator<Item = T>,
@@ -99,7 +99,7 @@ where
 
 pub(crate) async fn handle_cli<A, S>(cli: &CliState<A, S>) -> RoadsterResult<bool>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -120,7 +120,7 @@ where
 #[cfg(test)]
 pub struct TestCli<S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     _state: std::marker::PhantomData<S>,
@@ -130,14 +130,14 @@ where
 mockall::mock! {
     pub TestCli<S>
     where
-        S: Clone + Send + Sync + 'static,
+        S: 'static + Send + Sync + Clone,
         AppContext: FromRef<S>,
     {}
 
     #[async_trait]
     impl<S> RunCommand<MockApp<S>, S> for TestCli<S>
     where
-        S: Clone + Send + Sync + 'static,
+        S: 'static + Send + Sync + Clone,
         AppContext: FromRef<S>,
     {
         type Error = std::convert::Infallible;
@@ -147,7 +147,7 @@ mockall::mock! {
 
     impl<S> clap::FromArgMatches for TestCli<S>
     where
-        S: Clone + Send + Sync + 'static,
+        S: 'static + Send + Sync + Clone,
         AppContext: FromRef<S>,
     {
         fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error>;
@@ -156,7 +156,7 @@ mockall::mock! {
 
     impl<S> clap::Args for TestCli<S>
     where
-        S: Clone + Send + Sync + 'static,
+        S: 'static + Send + Sync + Clone,
         AppContext: FromRef<S>,
     {
         fn augment_args(cmd: clap::Command) -> clap::Command;
@@ -165,7 +165,7 @@ mockall::mock! {
 
     impl<S> Clone for TestCli<S>
     where
-        S: Clone + Send + Sync + 'static,
+        S: 'static + Send + Sync + Clone,
         AppContext: FromRef<S>,
     {
         fn clone(&self) -> Self;

src/api/cli/roadster/health.rs

@@ -22,7 +22,7 @@ pub struct HealthArgs {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for HealthArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/cli/roadster/list_routes.rs

@@ -18,7 +18,7 @@ pub struct ListRoutesArgs {}
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for ListRoutesArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/cli/roadster/migrate.rs

@@ -21,7 +21,7 @@ pub struct MigrateArgs {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for MigrateArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -47,7 +47,7 @@ pub enum MigrateCommand {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for MigrateCommand
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -93,7 +93,7 @@ fn is_destructive(command: &MigrateCommand) -> bool {
 // Todo: reduce duplication
 async fn migrate_up<A, S>(cli: &CliState<A, S>, args: &UpArgs) -> RoadsterResult<()>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -121,7 +121,7 @@ where
 // Todo: reduce duplication
 async fn migrate_down<A, S>(cli: &CliState<A, S>, args: &DownArgs) -> RoadsterResult<()>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -148,7 +148,7 @@ where
 
 async fn print_status<A, S>(cli: &CliState<A, S>) -> RoadsterResult<()>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/cli/roadster/mod.rs

@@ -31,7 +31,7 @@ pub mod print_config;
 #[async_trait]
 pub(crate) trait RunRoadsterCommand<A, S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -78,7 +78,7 @@ impl RoadsterCli {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for RoadsterCli
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -104,7 +104,7 @@ pub enum RoadsterCommand {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for RoadsterCommand
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -125,7 +125,7 @@ pub struct RoadsterArgs {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for RoadsterArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {
@@ -137,7 +137,7 @@ where
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for RoadsterSubCommand
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/cli/roadster/open_api.rs

@@ -10,7 +10,7 @@ use axum_core::extract::FromRef;
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for OpenApiArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/cli/roadster/print_config.rs

@@ -36,7 +36,7 @@ pub enum Format {
 #[async_trait]
 impl<A, S> RunRoadsterCommand<A, S> for PrintConfigArgs
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
     A: App<S>,
 {

src/api/core/health.rs

@@ -37,7 +37,7 @@ pub async fn health_check<S>(
     duration: Option<Duration>,
 ) -> RoadsterResult<HeathCheckResponse>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     let context = AppContext::from_ref(state);
@@ -50,7 +50,7 @@ pub(crate) async fn health_check_with_checks<S>(
     duration: Option<Duration>,
 ) -> RoadsterResult<HeathCheckResponse>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     if let Some(duration) = duration.as_ref() {

src/api/http/docs.rs

@@ -14,7 +14,7 @@ use std::sync::Arc;
 /// This API is only available when using Aide.
 pub fn routes<S>(parent: &str, state: &S) -> ApiRouter<S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     let context = AppContext::from_ref(state);

src/api/http/health.rs

@@ -25,7 +25,7 @@ const TAG: &str = "Health";
 
 pub fn routes<S>(parent: &str, state: &S) -> Router<S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     let context = AppContext::from_ref(state);
@@ -40,7 +40,7 @@ where
 #[cfg(feature = "open-api")]
 pub fn api_routes<S>(parent: &str, state: &S) -> ApiRouter<S>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     let context = AppContext::from_ref(state);
@@ -93,7 +93,7 @@ async fn health_get<S>(
     Query(query): Query<HeathCheckRequest>,
 ) -> RoadsterResult<Json<HeathCheckResponse>>
 where
-    S: Clone + Send + Sync + 'static,
+    S: 'static + Send + Sync + Clone,
     AppContext: FromRef<S>,
 {
     let duration = query