Update latest version of aws-smithy-http-server to legacy

Author: Fahad Zubair

rust-runtime/aws-smithy-legacy-http-server/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "aws-smithy-legacy-http-server"
-version = "0.65.7"
-authors = ["Smithy Legacy Rust Server <[email protected]>"]
+version = "0.65.8"
+authors = ["Smithy Rust Server <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/smithy-lang/smithy-rs"
 keywords = ["smithy", "framework", "web", "api", "aws"]
 categories = ["asynchronous", "web-programming", "api-bindings"]
 description = """
-Legacy server runtime for Smithy Rust Server Framework.
+Server runtime for Smithy Rust Server Framework.
 """
 publish = true
 
@@ -18,12 +18,12 @@ unredacted-logging = []
 request-id = ["dep:uuid"]
 
 [dependencies]
-aws-smithy-legacy-http = { path = "../aws-smithy-legacy-http", features = ["rt-tokio", "event-stream"] }
+aws-smithy-http = { path = "../aws-smithy-legacy-http", features = ["rt-tokio"], package = "aws-smithy-legacy-http" }
 aws-smithy-json = { path = "../aws-smithy-json" }
-aws-smithy-cbor = { path = "../aws-smithy-cbor" }
-aws-smithy-xml = { path = "../aws-smithy-xml" }
 aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["http-02x"] }
 aws-smithy-types = { path = "../aws-smithy-types", features = ["http-body-0-4-x", "hyper-0-14-x"] }
+aws-smithy-xml = { path = "../aws-smithy-xml" }
+aws-smithy-cbor = { path = "../aws-smithy-cbor" }
 bytes = "1.10.0"
 futures-util = { version = "0.3.29", default-features = false }
 http = "0.2.9"

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/mod.rs

@@ -12,8 +12,8 @@
 //!
 //! ```
 //! # use std::convert::Infallible;
-//! # use aws_smithy_http_server::instrumentation::{*, sensitivity::{*, headers::*, uri::*}};
-//! # use aws_smithy_http_server::shape_id::ShapeId;
+//! # use aws_smithy_legacy_http_server::instrumentation::{*, sensitivity::{*, headers::*, uri::*}};
+//! # use aws_smithy_legacy_http_server::shape_id::ShapeId;
 //! # use http::{Request, Response};
 //! # use tower::{util::service_fn, Service};
 //! # async fn service(request: Request<()>) -> Result<Response<()>, Infallible> {

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/sensitivity/headers.rs

@@ -31,7 +31,7 @@ pub struct HeaderMarker {
 /// # Example
 ///
 /// ```
-/// # use aws_smithy_http_server::instrumentation::sensitivity::headers::{SensitiveHeaders, HeaderMarker};
+/// # use aws_smithy_legacy_http_server::instrumentation::sensitivity::headers::{SensitiveHeaders, HeaderMarker};
 /// # use http::header::HeaderMap;
 /// # let headers = HeaderMap::new();
 /// // Headers with keys equal to "header-name" are sensitive
@@ -190,7 +190,7 @@ mod tests {
         let original: HeaderMap = to_header_map(HEADER_MAP);
 
         let output = SensitiveHeaders::new(&original, |_| HeaderMarker::default());
-        assert_eq!(format!("{:?}", output), format!("{:?}", original));
+        assert_eq!(format!("{output:?}"), format!("{:?}", original));
     }
 
     #[cfg(not(feature = "unredacted-logging"))]
@@ -212,7 +212,7 @@ mod tests {
             value: true,
             key_suffix: None,
         });
-        assert_eq!(format!("{:?}", output), format!("{:?}", expected));
+        assert_eq!(format!("{output:?}"), format!("{:?}", expected));
     }
 
     #[cfg(not(feature = "unredacted-logging"))]
@@ -234,7 +234,7 @@ mod tests {
             value: name == "name-a",
             key_suffix: None,
         });
-        assert_eq!(format!("{:?}", output), format!("{:?}", expected));
+        assert_eq!(format!("{output:?}"), format!("{:?}", expected));
     }
 
     #[cfg(not(feature = "unredacted-logging"))]
@@ -261,6 +261,6 @@ mod tests {
                 None
             },
         });
-        assert_eq!(format!("{:?}", output), format!("{:?}", expected));
+        assert_eq!(format!("{output:?}"), format!("{:?}", expected));
     }
 }

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/sensitivity/sensitive.rs

@@ -22,7 +22,7 @@ use super::REDACTED;
 /// # Example
 ///
 /// ```
-/// # use aws_smithy_http_server::instrumentation::sensitivity::Sensitive;
+/// # use aws_smithy_legacy_http_server::instrumentation::sensitivity::Sensitive;
 /// # let address = "";
 /// tracing::debug!(
 ///     name = %Sensitive("Alice"),
@@ -78,11 +78,11 @@ mod tests {
     fn debug() {
         let inner = "hello world";
         let sensitive = Sensitive(inner);
-        let actual = format!("{:?}", sensitive);
+        let actual = format!("{sensitive:?}");
         let expected = if cfg!(feature = "unredacted-logging") {
-            format!("{:?}", inner)
+            format!("{inner:?}")
         } else {
-            format!("{:?}", REDACTED)
+            format!("{REDACTED:?}")
         };
         assert_eq!(actual, expected)
     }
@@ -91,7 +91,7 @@ mod tests {
     fn display() {
         let inner = "hello world";
         let sensitive = Sensitive(inner);
-        let actual = format!("{}", sensitive);
+        let actual = format!("{sensitive}");
         let expected = if cfg!(feature = "unredacted-logging") {
             inner.to_string()
         } else {

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/sensitivity/uri/label.rs

@@ -18,7 +18,7 @@ use crate::instrumentation::{sensitivity::Sensitive, MakeFmt};
 /// # Example
 ///
 /// ```
-/// # use aws_smithy_http_server::instrumentation::sensitivity::uri::Label;
+/// # use aws_smithy_legacy_http_server::instrumentation::sensitivity::uri::Label;
 /// # use http::Uri;
 /// # let path = "";
 /// // Path segment 2 is redacted and a trailing greedy label
@@ -42,7 +42,7 @@ pub struct Label<'a, F> {
 /// The pattern, `/alpha/beta/{greedy+}/trail`, has segment index 2 and offset from the end of 6.
 ///
 /// ```rust
-/// # use aws_smithy_http_server::instrumentation::sensitivity::uri::GreedyLabel;
+/// # use aws_smithy_legacy_http_server::instrumentation::sensitivity::uri::GreedyLabel;
 /// let greedy_label = GreedyLabel::new(2, 6);
 /// ```
 #[derive(Clone, Debug)]
@@ -101,7 +101,7 @@ where
                             if (self.label_marker)(index) {
                                 write!(f, "/{}", Sensitive(segment))?;
                             } else {
-                                write!(f, "/{}", segment)?;
+                                write!(f, "/{segment}")?;
                             }
                             // Add the segment length and the separator to the `greedy_start`.
                             let greedy_start = greedy_start + segment.len() + 1;
@@ -140,7 +140,7 @@ where
                 if (self.label_marker)(index) {
                     write!(f, "/{}", Sensitive(segment))?;
                 } else {
-                    write!(f, "/{}", segment)?;
+                    write!(f, "/{segment}")?;
                 }
             }
         }

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/sensitivity/uri/query.rs

@@ -27,7 +27,7 @@ pub struct QueryMarker {
 /// # Example
 ///
 /// ```
-/// # use aws_smithy_http_server::instrumentation::sensitivity::uri::{Query, QueryMarker};
+/// # use aws_smithy_legacy_http_server::instrumentation::sensitivity::uri::{Query, QueryMarker};
 /// # let uri = "";
 /// // Query string value with key "name" is redacted
 /// let uri = Query::new(&uri, |x| QueryMarker { key: false, value: x == "name" } );

rust-runtime/aws-smithy-legacy-http-server/src/instrumentation/service.rs

@@ -88,8 +88,8 @@ where
 /// # Example
 ///
 /// ```
-/// # use aws_smithy_http_server::instrumentation::{sensitivity::{*, uri::*, headers::*}, *};
-/// # use aws_smithy_http_server::shape_id::ShapeId;
+/// # use aws_smithy_legacy_http_server::instrumentation::{sensitivity::{*, uri::*, headers::*}, *};
+/// # use aws_smithy_legacy_http_server::shape_id::ShapeId;
 /// # use tower::{Service, service_fn};
 /// # use http::{Request, Response};
 /// # async fn f(request: Request<()>) -> Result<Response<()>, ()> { Ok(Response::new(())) }

rust-runtime/aws-smithy-legacy-http-server/src/layer/alb_health_check.rs

@@ -9,7 +9,7 @@
 //! # Example
 //!
 //! ```no_run
-//! use aws_smithy_http_server::layer::alb_health_check::AlbHealthCheckLayer;
+//! use aws_smithy_legacy_http_server::layer::alb_health_check::AlbHealthCheckLayer;
 //! use hyper::StatusCode;
 //! use tower::Layer;
 //!

rust-runtime/aws-smithy-legacy-http-server/src/operation/mod.rs

@@ -24,8 +24,8 @@
 //! is identified with the implementation
 //!
 //! ```rust,no_run
-//! # use aws_smithy_http_server::shape_id::ShapeId;
-//! # use aws_smithy_http_server::operation::OperationShape;
+//! # use aws_smithy_legacy_http_server::shape_id::ShapeId;
+//! # use aws_smithy_legacy_http_server::operation::OperationShape;
 //! # pub struct CartIdentifier;
 //! # pub struct ShoppingCart;
 //! # pub enum GetShoppingError {}
@@ -55,7 +55,7 @@
 //! implement [`Handler`]:
 //!
 //! ```rust,no_run
-//! # use aws_smithy_http_server::Extension;
+//! # use aws_smithy_legacy_http_server::Extension;
 //! # pub struct CartIdentifier;
 //! # pub struct ShoppingCart;
 //! # pub enum GetShoppingError {}
@@ -101,9 +101,9 @@
 //!
 //! ```rust,no_run
 //! # use std::task::{Poll, Context};
-//! # use aws_smithy_http_server::operation::*;
+//! # use aws_smithy_legacy_http_server::operation::*;
 //! # use tower::Service;
-//! # use aws_smithy_http_server::shape_id::ShapeId;
+//! # use aws_smithy_legacy_http_server::shape_id::ShapeId;
 //! # pub struct CartIdentifier;
 //! # pub struct ShoppingCart;
 //! # pub enum GetShoppingError {}

rust-runtime/aws-smithy-legacy-http-server/src/plugin/closure.rs

@@ -29,7 +29,7 @@ where
 /// # Example
 ///
 /// ```rust
-/// # use aws_smithy_http_server::{service::*, operation::OperationShape, plugin::Plugin, shape_id::ShapeId};
+/// # use aws_smithy_legacy_http_server::{service::*, operation::OperationShape, plugin::Plugin, shape_id::ShapeId};
 /// # pub enum Operation { CheckHealth, GetPokemonSpecies }
 /// # impl Operation { fn shape_id(&self) -> ShapeId { ShapeId::new("", "", "") }}
 /// # pub struct CheckHealth;
@@ -45,7 +45,7 @@ where
 /// # impl OperationShape for GetPokemonSpecies { const ID: ShapeId = ShapeId::new("", "", ""); type Input = (); type Output = (); type Error = (); }
 /// # impl ContainsOperation<CheckHealth> for PokemonService { const VALUE: Operation = Operation::CheckHealth; }
 /// # impl ContainsOperation<GetPokemonSpecies> for PokemonService { const VALUE: Operation = Operation::GetPokemonSpecies; }
-/// use aws_smithy_http_server::plugin::plugin_from_operation_fn;
+/// use aws_smithy_legacy_http_server::plugin::plugin_from_operation_fn;
 /// use tower::layer::layer_fn;
 ///
 /// struct FooService<S> {