From b2b9272bb7ef14ff0ff29e0a440dcf5bc4de7447 Mon Sep 17 00:00:00 2001
From: 82marbag <69267416+82marbag@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:17:04 +0200
Subject: [PATCH] Type alias

Signed-off-by: Daniele Ahmed <ahmeddan@amazon.de>
---
 .../src/operation/upgrade.rs                     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rust-runtime/aws-smithy-http-server/src/operation/upgrade.rs b/rust-runtime/aws-smithy-http-server/src/operation/upgrade.rs
index 0156da850d..ff12e55005 100644
--- a/rust-runtime/aws-smithy-http-server/src/operation/upgrade.rs
+++ b/rust-runtime/aws-smithy-http-server/src/operation/upgrade.rs
@@ -71,9 +71,6 @@ impl<S, P, Op, E, B> Layer<S> for UpgradeLayer<P, Op, E, B> {
     }
 }
 
-/// An alias allowing for quick access to [`UpgradeLayer`]s target [`Service`].
-pub type UpgradedService<P, Op, E, B, S> = <UpgradeLayer<P, Op, E, B> as Layer<S>>::Service;
-
 /// A [`Service`] responsible for wrapping an operation [`Service`] accepting and returning Smithy
 /// types, and converting it into a [`Service`] accepting and returning [`http`] types.
 pub struct Upgrade<Protocol, Operation, Exts, B, S> {
@@ -227,6 +224,10 @@ pub trait Upgradable<Protocol, Operation, Exts, B, Plugin> {
     fn upgrade(self, plugin: &Plugin) -> Route<B>;
 }
 
+type UpgradedService<Pl, P, Op, Exts, B, S, L> = <<Pl as Plugin<P, Op, S, L>>::Layer as Layer<
+    Upgrade<P, Op, Exts, B, <Pl as Plugin<P, Op, S, L>>::Service>,
+>>::Service;
+
 impl<P, Op, Exts, B, Pl, S, L, PollError> Upgradable<P, Op, Exts, B, Pl> for Operation<S, L>
 where
     // `Op` is used to specify the operation shape
@@ -257,8 +258,8 @@ where
 
     // For `Route::new` for the resulting service
     <Pl::Layer as Layer<Upgrade<P, Op, Exts, B, Pl::Service>>>::Service: Service<http::Request<B>, Error = Infallible>,
-    <<Pl as Plugin<P, Op, S, L>>::Layer as Layer<Upgrade<P, Op, Exts, B, <Pl as Plugin<P, Op, S, L>>::Service>>>::Service: Clone + Send + 'static,
-    <<<Pl as Plugin<P, Op, S, L>>::Layer as Layer<Upgrade<P, Op, Exts, B, <Pl as Plugin<P, Op, S, L>>::Service>>>::Service as Service<http::Request<B>>>::Future: Send + 'static,
+    UpgradedService<Pl, P, Op, Exts, B, S, L>: Clone + Send + 'static,
+    <UpgradedService<Pl, P, Op, Exts, B, S, L> as Service<http::Request<B>>>::Future: Send + 'static,
 {
     /// Takes the [`Operation<S, L>`](Operation), applies [`Plugin`], then applies [`UpgradeLayer`] to
     /// the modified `S`, then finally applies the modified `L`.
@@ -284,7 +285,7 @@ pub struct FailOnMissingOperation;
 impl<P, Op, Exts, B, Pl> Upgradable<P, Op, Exts, B, Pl> for FailOnMissingOperation
 where
     InternalFailureException: IntoResponse<P>,
-    P: Send + 'static,
+    P: 'static,
 {
     fn upgrade(self, _plugin: &Pl) -> Route<B> {
         Route::new(MissingFailure { _protocol: PhantomData })
@@ -292,8 +293,9 @@ where
 }
 
 /// A [`Service`] which always returns an internal failure message and logs an error.
+#[derive(Copy)]
 pub struct MissingFailure<P> {
-    _protocol: PhantomData<P>,
+    _protocol: PhantomData<fn(P)>,
 }
 
 impl<P> Clone for MissingFailure<P> {