Export ConnectionInfo, Format, and LocalId

common/compliance/cargo-compliance/src/object.rs

@@ -99,14 +99,12 @@ impl<'a> AnnoObject for (&MultiArch<'a>, &'a [u8]) {
 impl<'a> AnnoObject for MachO<'a> {
     fn load(&self, annotations: &mut AnnotationSet) -> Result<(), Error> {
         for sections in self.segments.sections() {
-            for section in sections {
-                if let Ok((section, data)) = section {
-                    if let (b"__DATA\0\0\0\0\0\0\0\0\0\0", b"__compliance\0\0\0\0") =
-                        (&section.segname, &section.sectname)
-                    {
-                        for annotation in Parser(data) {
-                            annotations.insert(annotation?);
-                        }
+            for (section, data) in sections.flatten() {
+                if let (b"__DATA\0\0\0\0\0\0\0\0\0\0", b"__compliance\0\0\0\0") =
+                    (&section.segname, &section.sectname)
+                {
+                    for annotation in Parser(data) {
+                        annotations.insert(annotation?);
                     }
                 }
             }

common/compliance/cargo-compliance/src/specification/ietf.rs

@@ -219,6 +219,7 @@ impl<'a> Parser<'a> {
 
 macro_rules! ietf_test {
     ($name:ident, $file:expr) => {
+        #[ignore] // TODO: https://github.com/awslabs/s2n-quic/issues/649
         #[test]
         fn $name() {
             let res = parse(include_str!(concat!(

quic/s2n-quic-core/src/frame/ack.rs

@@ -303,9 +303,9 @@ decoder_parameterized_value!(
             let range_buffer = range_buffer.into();
 
             let ack_ranges = AckRangesDecoder {
+                largest_acknowledged,
                 ack_range_count,
                 range_buffer,
-                largest_acknowledged,
             };
 
             Ok((ack_ranges, remaining))

quic/s2n-quic-core/src/packet/decoding.rs

@@ -105,8 +105,8 @@ impl<'a> HeaderDecoder<'a> {
         let packet_len = self.decoded_len();
 
         Ok(HeaderDecoderResult {
-            header_len,
             packet_len,
+            header_len,
         })
     }
 
@@ -115,8 +115,8 @@ impl<'a> HeaderDecoder<'a> {
         let packet_len = self.initial_buffer_len;
 
         Ok(HeaderDecoderResult {
-            header_len,
             packet_len,
+            header_len,
         })
     }
 

quic/s2n-quic-core/src/packet/number/truncated_packet_number.rs

@@ -20,6 +20,7 @@ pub struct TruncatedPacketNumber {
     pub(crate) value: TruncatedPacketNumberValue,
 }
 
+#[allow(clippy::len_without_is_empty)] // Clippy gets confused by the const on is_empty
 impl TruncatedPacketNumber {
     /// Returns the space for the given `TruncatedPacketNumber`
     #[inline]
@@ -116,7 +117,7 @@ impl TruncatedPacketNumberValue {
             Self::U32(_value) => PacketNumberLenValue::U32,
         };
 
-        PacketNumberLen { value, space }
+        PacketNumberLen { space, value }
     }
 }
 

quic/s2n-quic-integration/src/api/test.rs

@@ -191,8 +191,8 @@ impl Handle {
         recv_streams: flume::Sender<AcceptorMessage<ReceiveStream>>,
     ) -> Self {
         Self {
-            bidi_streams,
             recv_streams,
+            bidi_streams,
         }
     }
 

quic/s2n-quic-platform/src/message/mmsg.rs

@@ -118,8 +118,8 @@ impl<Payloads: crate::buffer::Buffer> Ring<Payloads> {
             .collect();
 
         Self {
-            payloads,
             messages,
+            payloads,
             iovecs,
             msg_names,
         }

quic/s2n-quic-platform/src/message/msg.rs

@@ -209,8 +209,8 @@ impl<Payloads: crate::buffer::Buffer> Ring<Payloads> {
         }
 
         Self {
-            payloads,
             messages,
+            payloads,
             iovecs,
             msg_names,
         }

quic/s2n-quic-platform/src/message/simple.rs

@@ -107,7 +107,7 @@ impl<Payloads: crate::buffer::Buffer> Ring<Payloads> {
             messages.push(messages[index]);
         }
 
-        Self { payloads, messages }
+        Self { messages, payloads }
     }
 }
 

quic/s2n-quic-ring/tests/fuzz_target/main.rs

@@ -332,7 +332,7 @@ fn gen_negotiated_secrets() -> impl ValueGenerator<Output = (&'static Algorithm,
 
 fn gen_secrets(algo: hkdf::Algorithm) -> impl ValueGenerator<Output = SecretPair> {
     (gen_secret(algo), gen_secret(algo))
-        .map_gen(move |(client, server)| SecretPair { client, server })
+        .map_gen(move |(client, server)| SecretPair { server, client })
 }
 
 fn gen_secret(algo: hkdf::Algorithm) -> impl ValueGenerator<Output = Prk> {

quic/s2n-quic-rustls/src/lib.rs

@@ -324,8 +324,8 @@ macro_rules! impl_tls {
 
                 Ok(tls::ApplicationParameters {
                     alpn_protocol,
-                    transport_parameters,
                     sni,
+                    transport_parameters,
                 })
             }
 
@@ -343,7 +343,7 @@ macro_rules! impl_tls {
                 self.0
                     .session
                     .write_hs(buffer)
-                    .map(|Secrets { client, server }| SecretPair { client, server })
+                    .map(|Secrets { client, server }| SecretPair { server, client })
             }
         }
     };

quic/s2n-quic-tls/src/callback.rs

@@ -429,8 +429,8 @@ unsafe fn get_application_params<'a>(
     let sni = get_sni(connection);
 
     Ok(tls::ApplicationParameters {
-        sni,
         alpn_protocol,
+        sni,
         transport_parameters,
     })
 }

quic/s2n-quic-transport/src/stream/send_stream.rs

@@ -1023,9 +1023,9 @@ impl StreamInterestProvider for SendStream {
         };
 
         StreamInterests {
-            finalization,
             connection_flow_control_credits,
             stream_flow_control_credits,
+            finalization,
             delivery_notifications,
             transmission,
         }

quic/s2n-quic/src/provider/connection_id.rs

@@ -1,8 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use s2n_quic_core::connection::id::Format;
-pub use s2n_quic_core::connection::id::{Generator, Validator};
+pub use s2n_quic_core::connection::id::{ConnectionInfo, Format, Generator, LocalId, Validator};
 
 /// Provides connection id support for an endpoint
 pub trait Provider: 'static {

quic/s2n-quic/src/server/providers.rs

@@ -106,9 +106,9 @@ impl<
             endpoint_limits,
             event,
             limits,
-            token,
             sync,
             tls,
+            token,
         };
 
         let (endpoint, acceptor) = endpoint::Endpoint::new(endpoint_config);