Merge branch 'main' into tls-version-cipher-metadata

Author: iadev09

Cargo.toml

@@ -67,6 +67,7 @@ elided_lifetimes_in_paths = "warn"
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
 unnameable_types = "warn"
 unreachable_pub = "warn"
+unused_qualifications = "warn"
 
 [workspace.lints.clippy]
 manual_let_else = "warn"

bench/src/lib.rs

@@ -30,7 +30,7 @@ pub fn configure_tracing_subscriber() {
 
 /// Creates a server endpoint which runs on the given runtime
 pub fn server_endpoint(
-    rt: &tokio::runtime::Runtime,
+    rt: &Runtime,
     cert: CertificateDer<'static>,
     key: PrivateKeyDer<'static>,
     opt: &Opt,

perf/src/noprotection.rs

@@ -131,7 +131,7 @@ impl crypto::Session for NoProtectionSession {
 
 impl crypto::ClientConfig for NoProtectionClientConfig {
     fn start_session(
-        self: std::sync::Arc<Self>,
+        self: Arc<Self>,
         version: u32,
         server_name: &str,
         params: &transport_parameters::TransportParameters,

perf/src/stats.rs

@@ -121,7 +121,7 @@ impl Stats {
     #[cfg(feature = "json-output")]
     pub fn print_json(&self, path: &Path) -> io::Result<()> {
         if path == Path::new("-") {
-            json::print(self, std::io::stdout());
+            json::print(self, io::stdout());
         } else {
             let file = File::create(path)?;
             json::print(self, file)
@@ -281,7 +281,7 @@ mod json {
 
     fn serialize_timestamp<S>(time: &SystemTime, s: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         use serde::ser::SerializeMap;
         let mut state = s.serialize_map(Some(1))?;
@@ -355,7 +355,7 @@ mod json {
 
     impl Stream {
         fn from_stream_interval_stats(
-            stats: &stats::StreamIntervalStats,
+            stats: &StreamIntervalStats,
             period: &stats::IntervalPeriod,
         ) -> Self {
             let bits_per_second = stats.bytes as f64 * 8.0 / period.seconds;

quinn-proto/src/config/transport.rs

@@ -781,7 +781,7 @@ impl From<VarInt> for IdleTimeout {
     }
 }
 
-impl std::convert::TryFrom<Duration> for IdleTimeout {
+impl TryFrom<Duration> for IdleTimeout {
     type Error = VarIntBoundsExceeded;
 
     fn try_from(timeout: Duration) -> Result<Self, Self::Error> {

quinn-proto/src/connection/mod.rs

@@ -709,7 +709,7 @@ impl Connection {
                         // Clamp the datagram to at most the minimum MTU to ensure that loss probes
                         // can get through and enable recovery even if the path MTU has shrank
                         // unexpectedly.
-                        std::cmp::min(segment_size, usize::from(INITIAL_MTU))
+                        cmp::min(segment_size, usize::from(INITIAL_MTU))
                     }
                 };
                 buf_capacity += next_datagram_size_limit;
@@ -3351,7 +3351,7 @@ impl Connection {
                 id = %issued.id,
                 "NEW_CONNECTION_ID"
             );
-            frame::NewConnectionId {
+            NewConnectionId {
                 sequence: issued.sequence,
                 retire_prior_to: self.local_cid_state.retire_prior_to(),
                 id: issued.id,
@@ -3515,7 +3515,7 @@ impl Connection {
             negotiate_max_idle_timeout(self.config.max_idle_timeout, Some(params.max_idle_timeout));
         trace!("negotiated max idle timeout {:?}", self.idle_timeout);
         if let Some(ref info) = params.preferred_address {
-            self.rem_cids.insert(frame::NewConnectionId {
+            self.rem_cids.insert(NewConnectionId {
                 sequence: 1,
                 id: info.connection_id,
                 reset_token: info.stateless_reset_token,

quinn-proto/src/connection/spaces.rs

@@ -568,7 +568,7 @@ impl Dedup {
 type Window = u128;
 
 /// Number of packets tracked by `Dedup`
-const WINDOW_SIZE: u64 = 1 + mem::size_of::<Window>() as u64 * 8;
+const WINDOW_SIZE: u64 = 1 + size_of::<Window>() as u64 * 8;
 
 /// Indicates which data is available for sending
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -1097,6 +1097,6 @@ mod test {
     fn sent_packet_size() {
         // The tracking state of sent packets should be minimal, and not grow
         // over time.
-        assert!(std::mem::size_of::<SentPacket>() <= 128);
+        assert!(size_of::<SentPacket>() <= 128);
     }
 }

quinn-proto/src/crypto/rustls.rs

@@ -235,7 +235,7 @@ const RETRY_INTEGRITY_NONCE_V1: [u8; 12] = [
     0x46, 0x15, 0x99, 0xd3, 0x5d, 0x63, 0x2b, 0xf2, 0x23, 0x98, 0x25, 0xbb,
 ];
 
-impl crypto::HeaderKey for Box<dyn HeaderProtectionKey> {
+impl HeaderKey for Box<dyn HeaderProtectionKey> {
     fn decrypt(&self, pn_offset: usize, packet: &mut [u8]) {
         let (header, sample) = packet.split_at_mut(pn_offset + 4);
         let (first, rest) = header.split_at_mut(1);
@@ -380,7 +380,7 @@ impl crypto::ClientConfig for QuicClientConfig {
             version,
             got_handshake_data: false,
             next_secrets: None,
-            inner: rustls::quic::Connection::Client(
+            inner: Connection::Client(
                 rustls::quic::ClientConnection::new(
                     self.inner.clone(),
                     version,
@@ -461,7 +461,7 @@ impl QuicServerConfig {
     pub(crate) fn new(
         cert_chain: Vec<CertificateDer<'static>>,
         key: PrivateKeyDer<'static>,
-    ) -> Result<Self, rustls::Error> {
+    ) -> Result<Self, Error> {
         let inner = Self::inner(cert_chain, key)?;
         Ok(Self {
             // We're confident that the *ring* default provider contains TLS13_AES_128_GCM_SHA256
@@ -492,7 +492,7 @@ impl QuicServerConfig {
     pub(crate) fn inner(
         cert_chain: Vec<CertificateDer<'static>>,
         key: PrivateKeyDer<'static>,
-    ) -> Result<rustls::ServerConfig, rustls::Error> {
+    ) -> Result<rustls::ServerConfig, Error> {
         let mut inner = rustls::ServerConfig::builder_with_provider(configured_provider())
             .with_protocol_versions(&[&rustls::version::TLS13])
             .unwrap() // The *ring* default provider supports TLS 1.3
@@ -536,7 +536,7 @@ impl crypto::ServerConfig for QuicServerConfig {
             version,
             got_handshake_data: false,
             next_secrets: None,
-            inner: rustls::quic::Connection::Server(
+            inner: Connection::Server(
                 rustls::quic::ServerConnection::new(self.inner.clone(), version, to_vec(params))
                     .unwrap(),
             ),
@@ -586,9 +586,7 @@ pub(crate) fn initial_suite_from_provider(
         .cipher_suites
         .iter()
         .find_map(|cs| match (cs.suite(), cs.tls13()) {
-            (rustls::CipherSuite::TLS13_AES_128_GCM_SHA256, Some(suite)) => {
-                Some(suite.quic_suite())
-            }
+            (CipherSuite::TLS13_AES_128_GCM_SHA256, Some(suite)) => Some(suite.quic_suite()),
             _ => None,
         })
         .flatten()

quinn-proto/src/tests/mod.rs

@@ -839,7 +839,7 @@ fn alpn_success() {
         .crypto_session()
         .handshake_data()
         .unwrap()
-        .downcast::<crate::crypto::rustls::HandshakeData>()
+        .downcast::<crypto::rustls::HandshakeData>()
         .unwrap();
     assert_eq!(hd.protocol.unwrap(), &b"bar"[..]);
     assert_eq!(

quinn-proto/src/tests/util.rs

@@ -646,7 +646,7 @@ fn client_crypto_inner(
     certs: Option<Vec<CertificateDer<'static>>>,
     alpn: Option<Vec<Vec<u8>>>,
 ) -> QuicClientConfig {
-    let mut roots = rustls::RootCertStore::empty();
+    let mut roots = RootCertStore::empty();
     for cert in certs.unwrap_or_else(|| vec![CERTIFIED_KEY.cert.der().clone()]) {
         roots.add(cert).unwrap();
     }