From 445f73b27eae529bb895a7678968e4c0c215ef8a Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum <55108558+WesleyRosenblum@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:03:39 -0700 Subject: [PATCH] chore(s2n-quic): remove bytes pin and fix new clippy lints (#2291) --- common/s2n-codec/src/lib.rs | 1 + dc/s2n-quic-dc/src/lib.rs | 2 ++ quic/s2n-quic-core/Cargo.toml | 3 +-- quic/s2n-quic-core/src/application/server_name.rs | 2 +- quic/s2n-quic-core/src/lib.rs | 1 + quic/s2n-quic-platform/src/lib.rs | 1 + quic/s2n-quic-qns/src/main.rs | 2 ++ quic/s2n-quic-tls/src/lib.rs | 2 ++ quic/s2n-quic-transport/src/lib.rs | 1 + quic/s2n-quic-transport/src/space/handshake_status.rs | 2 +- quic/s2n-quic/src/lib.rs | 2 +- quic/s2n-quic/src/provider/stateless_reset_token.rs | 4 ++-- 12 files changed, 16 insertions(+), 7 deletions(-) diff --git a/common/s2n-codec/src/lib.rs b/common/s2n-codec/src/lib.rs index a00265e8e5..ae7c6723ce 100644 --- a/common/s2n-codec/src/lib.rs +++ b/common/s2n-codec/src/lib.rs @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +#![allow(unexpected_cfgs)] #![cfg_attr(not(any(test, feature = "std")), no_std)] #[cfg(feature = "alloc")] diff --git a/dc/s2n-quic-dc/src/lib.rs b/dc/s2n-quic-dc/src/lib.rs index 98b5e5ad95..a016a68983 100644 --- a/dc/s2n-quic-dc/src/lib.rs +++ b/dc/s2n-quic-dc/src/lib.rs @@ -1,6 +1,8 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +#![allow(unexpected_cfgs)] + pub mod allocator; pub mod clock; pub mod congestion; diff --git a/quic/s2n-quic-core/Cargo.toml b/quic/s2n-quic-core/Cargo.toml index b498fbdb30..6b9ca6f73a 100644 --- a/quic/s2n-quic-core/Cargo.toml +++ b/quic/s2n-quic-core/Cargo.toml @@ -31,8 +31,7 @@ usdt = ["dep:probe"] atomic-waker = { version = "1", optional = true } bolero-generator = { version = "0.11", optional = true } byteorder = { version = "1", default-features = false } -# TODO: Unpin when https://github.com/aws/s2n-quic/issues/2289 is resolved -bytes = { version = "=1.6.1", optional = true, default-features = false } +bytes = { version = "1", optional = true, default-features = false } crossbeam-utils = { version = "0.8", optional = true } cfg-if = "1" hex-literal = "0.4" diff --git a/quic/s2n-quic-core/src/application/server_name.rs b/quic/s2n-quic-core/src/application/server_name.rs index eb2987d5d7..aa91e708a7 100644 --- a/quic/s2n-quic-core/src/application/server_name.rs +++ b/quic/s2n-quic-core/src/application/server_name.rs @@ -21,7 +21,7 @@ use bytes::Bytes; /// /// `ServerName` serves a dual purpose: /// - It can be converted into [`Bytes`] which supports zero-copy slicing and -/// reference counting. +/// reference counting. /// - It can be accessed as `&str` so that applications can reason about the string value. #[derive(Clone, PartialEq, Eq, Hash)] pub struct ServerName(Bytes); diff --git a/quic/s2n-quic-core/src/lib.rs b/quic/s2n-quic-core/src/lib.rs index c0f811aa97..e8a6297cac 100644 --- a/quic/s2n-quic-core/src/lib.rs +++ b/quic/s2n-quic-core/src/lib.rs @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +#![allow(unexpected_cfgs)] #![cfg_attr(not(any(test, feature = "std")), no_std)] #[cfg(feature = "alloc")] diff --git a/quic/s2n-quic-platform/src/lib.rs b/quic/s2n-quic-platform/src/lib.rs index 8f1ca70464..88e414473e 100644 --- a/quic/s2n-quic-platform/src/lib.rs +++ b/quic/s2n-quic-platform/src/lib.rs @@ -4,6 +4,7 @@ //! This module contains abstractions around the platform on which the //! stack is running +#![allow(unexpected_cfgs)] #![cfg_attr(not(any(test, feature = "std")), no_std)] extern crate alloc; diff --git a/quic/s2n-quic-qns/src/main.rs b/quic/s2n-quic-qns/src/main.rs index 230127ca7d..016b5fcf51 100644 --- a/quic/s2n-quic-qns/src/main.rs +++ b/quic/s2n-quic-qns/src/main.rs @@ -1,6 +1,8 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +#![allow(unexpected_cfgs)] + use structopt::StructOpt; pub type Error = Box; diff --git a/quic/s2n-quic-tls/src/lib.rs b/quic/s2n-quic-tls/src/lib.rs index 53b50d25c5..d0d0c6c093 100644 --- a/quic/s2n-quic-tls/src/lib.rs +++ b/quic/s2n-quic-tls/src/lib.rs @@ -1,6 +1,8 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +#![allow(unexpected_cfgs)] + use s2n_quic_core::application::ServerName; /// Ensure memory is correctly managed in tests diff --git a/quic/s2n-quic-transport/src/lib.rs b/quic/s2n-quic-transport/src/lib.rs index 40cb9e6d1e..eb515c7729 100644 --- a/quic/s2n-quic-transport/src/lib.rs +++ b/quic/s2n-quic-transport/src/lib.rs @@ -4,6 +4,7 @@ //! This module contains all main runtime components for receiving and sending //! data via the QUIC protocol. +#![allow(unexpected_cfgs)] #![deny(unused_must_use)] extern crate alloc; diff --git a/quic/s2n-quic-transport/src/space/handshake_status.rs b/quic/s2n-quic-transport/src/space/handshake_status.rs index 8fb3dd54df..eba9e0889d 100644 --- a/quic/s2n-quic-transport/src/space/handshake_status.rs +++ b/quic/s2n-quic-transport/src/space/handshake_status.rs @@ -35,7 +35,7 @@ pub type Flag = flag::Flag; /// - the handshake is complete and confirmed once the TLS-completes on the Server. /// - the Server is required to send a HANDSHAKE_DONE frame once the handshake completes. /// - the Client must wait for a HANDSHAKE_DONE (or an acked 1-rtt packet) to 'Confirm' -/// the handshake. +/// the handshake. /// /// Note: s2n-quic does not implement the optional 1-rtt acked requirement. #[derive(Debug, Default)] diff --git a/quic/s2n-quic/src/lib.rs b/quic/s2n-quic/src/lib.rs index 7d0ac9808c..a421f50212 100644 --- a/quic/s2n-quic/src/lib.rs +++ b/quic/s2n-quic/src/lib.rs @@ -66,7 +66,7 @@ //!``` //! //! 2. Build a custom s2n-tls TLS provider configured with a FIPS approved -//! [security policy](https://aws.github.io/s2n-tls/usage-guide/ch06-security-policies.html): +//! [security policy](https://aws.github.io/s2n-tls/usage-guide/ch06-security-policies.html): //! //!```ignore //! use s2n_quic::provider::tls::s2n_tls; diff --git a/quic/s2n-quic/src/provider/stateless_reset_token.rs b/quic/s2n-quic/src/provider/stateless_reset_token.rs index 33e6289516..a45e16b9a3 100644 --- a/quic/s2n-quic/src/provider/stateless_reset_token.rs +++ b/quic/s2n-quic/src/provider/stateless_reset_token.rs @@ -13,8 +13,8 @@ /// generating stateless reset tokens. This is in accordance with the following requirement: /// /// > More generally, servers MUST NOT generate a stateless reset -/// if a connection with the corresponding connection ID could -/// be active on any endpoint using the same static key. +/// > if a connection with the corresponding connection ID could +/// > be active on any endpoint using the same static key. /// /// This may require coordination between endpoints and/or careful setup of load balancing and /// packet routing, as well as ensuring the connection IDs in use are difficult to guess.