Merge branch 'quinn-rs:main' into udp-timestamp

Author: recatek

bench/src/bin/bulk.rs

@@ -11,10 +11,9 @@ use tokio::sync::Semaphore;
 use tracing::{info, trace};
 
 use bench::{
-    configure_tracing_subscriber, connect_client, drain_stream, rt, send_data_on_stream,
+    Opt, configure_tracing_subscriber, connect_client, drain_stream, rt, send_data_on_stream,
     server_endpoint,
     stats::{Stats, TransferResult},
-    Opt,
 };
 
 fn main() {

bench/src/lib.rs

@@ -11,8 +11,8 @@ use bytes::Bytes;
 use clap::Parser;
 use quinn::crypto::rustls::QuicClientConfig;
 use rustls::{
-    pki_types::{CertificateDer, PrivateKeyDer},
     RootCertStore,
+    pki_types::{CertificateDer, PrivateKeyDer},
 };
 use tokio::runtime::{Builder, Runtime};
 use tracing::trace;

deny.toml

@@ -16,3 +16,6 @@ private = { ignore = true }
 name = "ring"
 expression = "ISC AND MIT AND OpenSSL"
 license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
+
+[advisories]
+ignore = ["RUSTSEC-2025-0007"]

fuzz/fuzz_targets/packet.rs

@@ -4,8 +4,8 @@ extern crate proto;
 
 use libfuzzer_sys::fuzz_target;
 use proto::{
+    DEFAULT_SUPPORTED_VERSIONS, FixedLengthConnectionIdParser,
     fuzzing::{PacketParams, PartialDecode},
-    FixedLengthConnectionIdParser, DEFAULT_SUPPORTED_VERSIONS,
 };
 
 fuzz_target!(|data: PacketParams| {

perf/src/bin/perf_client.rs

@@ -7,7 +7,7 @@ use std::{
 use anyhow::{Context, Result};
 use bytes::Bytes;
 use clap::Parser;
-use quinn::{crypto::rustls::QuicClientConfig, TokioRuntime};
+use quinn::{TokioRuntime, crypto::rustls::QuicClientConfig};
 use rustls::pki_types::{CertificateDer, ServerName, UnixTime};
 use tokio::sync::Semaphore;
 use tracing::{debug, error, info};

perf/src/bin/perf_server.rs

@@ -3,11 +3,11 @@ use std::{fs, net::SocketAddr, path::PathBuf, sync::Arc, time::Duration};
 use anyhow::{Context, Result};
 use bytes::Bytes;
 use clap::Parser;
-use quinn::{crypto::rustls::QuicServerConfig, TokioRuntime};
+use quinn::{TokioRuntime, crypto::rustls::QuicServerConfig};
 use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer};
 use tracing::{debug, error, info};
 
-use perf::{bind_socket, noprotection::NoProtectionServerConfig, PERF_CIPHER_SUITES};
+use perf::{PERF_CIPHER_SUITES, bind_socket, noprotection::NoProtectionServerConfig};
 
 #[derive(Parser)]
 #[clap(name = "server")]

perf/src/noprotection.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 use bytes::BytesMut;
 
 use quinn_proto::{
+    ConnectionId, Side, TransportError,
     crypto::{
-        self,
+        self, CryptoError,
         rustls::{QuicClientConfig, QuicServerConfig},
-        CryptoError,
     },
-    transport_parameters, ConnectionId, Side, TransportError,
+    transport_parameters,
 };
 
 /// A rustls TLS session which does not perform packet encryption/decryption (for debugging purpose)

perf/src/stats.rs

@@ -90,8 +90,12 @@ impl Stats {
 
         println!("Stream metrics:\n");
 
-        println!("      │ Upload Duration │ Download Duration | FBL        | Upload Throughput | Download Throughput");
-        println!("──────┼─────────────────┼───────────────────┼────────────┼───────────────────┼────────────────────");
+        println!(
+            "      │ Upload Duration │ Download Duration | FBL        | Upload Throughput | Download Throughput"
+        );
+        println!(
+            "──────┼─────────────────┼───────────────────┼────────────┼───────────────────┼────────────────────"
+        );
 
         let print_metric = |label: &'static str, get_metric: fn(&Histogram<u64>) -> u64| {
             println!(
@@ -244,7 +248,7 @@ mod json {
     use crate::stats;
     use crate::stats::{Stats, StreamIntervalStats};
     use quinn::StreamId;
-    use serde::{self, ser::SerializeStruct, Serialize, Serializer};
+    use serde::{self, Serialize, Serializer, ser::SerializeStruct};
     use std::io::Write;
     use std::time::{SystemTime, UNIX_EPOCH};
 

quinn-proto/src/cid_generator.rs

@@ -2,9 +2,9 @@ use std::hash::Hasher;
 
 use rand::{Rng, RngCore};
 
-use crate::shared::ConnectionId;
 use crate::Duration;
 use crate::MAX_CID_SIZE;
+use crate::shared::ConnectionId;
 
 /// Generates connection IDs for incoming connections
 pub trait ConnectionIdGenerator: Send + Sync {

quinn-proto/src/cid_queue.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use crate::{frame::NewConnectionId, ConnectionId, ResetToken};
+use crate::{ConnectionId, ResetToken, frame::NewConnectionId};
 
 /// DataType stored in CidQueue buffer
 type CidData = (ConnectionId, Option<ResetToken>);