remove: some more unnecessary changes

rust-runtime/aws-smithy-http/src/result.rs

@@ -15,7 +15,6 @@
 use crate::operation;
 use aws_smithy_types::error::metadata::{ProvideErrorMetadata, EMPTY_ERROR_METADATA};
 use aws_smithy_types::error::ErrorMetadata;
-use aws_smithy_types::error::InterceptorError;
 use aws_smithy_types::retry::ErrorKind;
 use std::fmt;
 use std::fmt::{Debug, Display, Formatter};
@@ -72,7 +71,7 @@ pub mod builders {
     source_only_error_builder!(TimeoutError, TimeoutErrorBuilder, BoxError);
     source_only_error_builder!(DispatchFailure, DispatchFailureBuilder, ConnectorError);
 
-    /// Builder for [`ResponseError`](super::ResponseError).
+    /// Builder for [`ResponseError`](ResponseError).
     #[derive(Debug)]
     pub struct ResponseErrorBuilder<R> {
         source: Option<BoxError>,
@@ -127,7 +126,7 @@ pub mod builders {
         }
     }
 
-    /// Builder for [`ServiceError`](super::ServiceError).
+    /// Builder for [`ServiceError`](ServiceError).
     #[derive(Debug)]
     pub struct ServiceErrorBuilder<E, R> {
         source: Option<E>,
@@ -340,9 +339,6 @@ pub enum SdkError<E, R = operation::Response> {
 
     /// An error response was received from the service
     ServiceError(ServiceError<E, R>),
-
-    /// An error occurred within a smithy interceptor
-    InterceptorError(InterceptorError),
 }
 
 impl<E, R> SdkError<E, R> {
@@ -378,11 +374,6 @@ impl<E, R> SdkError<E, R> {
         Self::ServiceError(ServiceError { source, raw })
     }
 
-    /// Construct a `SdkError` for a smithy interceptor failure
-    pub fn interceptor_error(source: InterceptorError) -> Self {
-        Self::InterceptorError(source)
-    }
-
     /// Returns the underlying service error `E` if there is one
     ///
     /// If the `SdkError` is not a `ServiceError` (for example, the error is a network timeout),
@@ -440,7 +431,6 @@ impl<E, R> SdkError<E, R> {
             ResponseError(context) => Ok(context.source),
             DispatchFailure(context) => Ok(context.source.into()),
             ServiceError(context) => Ok(context.source.into()),
-            InterceptorError(context) => Ok(context.into()),
         }
     }
 }
@@ -453,7 +443,6 @@ impl<E, R> Display for SdkError<E, R> {
             SdkError::DispatchFailure(_) => write!(f, "dispatch failure"),
             SdkError::ResponseError(_) => write!(f, "response error"),
             SdkError::ServiceError(_) => write!(f, "service error"),
-            SdkError::InterceptorError(_) => write!(f, "an error occurred in a smithy interceptor"),
         }
     }
 }
@@ -471,7 +460,6 @@ where
             ResponseError(context) => Some(context.source.as_ref()),
             DispatchFailure(context) => Some(&context.source),
             ServiceError(context) => Some(&context.source),
-            InterceptorError(context) => Some(context),
         }
     }
 }
@@ -487,7 +475,6 @@ where
             Self::DispatchFailure(_) => &EMPTY_ERROR_METADATA,
             Self::ResponseError(_) => &EMPTY_ERROR_METADATA,
             Self::ServiceError(err) => err.source.meta(),
-            Self::InterceptorError(_) => &EMPTY_ERROR_METADATA,
         }
     }
 }

rust-runtime/aws-smithy-types/src/retry.rs

@@ -61,7 +61,7 @@ pub trait ProvideErrorKind {
 /// - The required retry delay exceeds the maximum backoff configured by the client
 /// - No retry tokens are available due to service health
 #[non_exhaustive]
-#[derive(Eq, PartialEq, Debug, Clone)]
+#[derive(Eq, PartialEq, Debug)]
 pub enum RetryKind {
     /// Retry the associated request due to a known `ErrorKind`.
     Error(ErrorKind),