Skip to content

Commit 8a7f7c7

Browse files
committed
test(s2n-quic-core): reduce const instruction counts
1 parent 6e3e3b2 commit 8a7f7c7

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

quic/s2n-quic-core/src/stream/testing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static DATA: Bytes = {
1515
const INNER: [u8; DATA_LEN] = {
1616
let mut data = [0; DATA_LEN];
1717
let mut idx = 0;
18-
while idx < data.len() {
18+
while idx < DATA_LEN {
1919
data[idx] = idx as u8;
2020
idx += 1;
2121
}

quic/s2n-quic-core/src/transport/parameters/disabled_parameter.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use super::{TransportParameter, TransportParameterId, TransportParameterValidator};
5-
use core::marker::PhantomData;
5+
use core::{fmt, marker::PhantomData};
66

77
/// Struct for marking a field as disabled for a given endpoint type
8-
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
8+
#[derive(Copy, Clone, PartialEq, Eq)]
99
pub struct DisabledParameter<T>(PhantomData<T>);
1010

11+
impl<T> fmt::Debug for DisabledParameter<T> {
12+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
13+
write!(f, "DisabledParameter")
14+
}
15+
}
16+
1117
impl<T> Default for DisabledParameter<T> {
1218
fn default() -> Self {
1319
Self(PhantomData)

quic/s2n-quic-core/src/transport/parameters/snapshots/s2n_quic_core__transport__parameters__tests__ClientTransportParameters__default.snap

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
source: quic/s2n-quic-core/src/transport/parameters/tests.rs
3-
assertion_line: 55
43
expression: default_value
54
---
65
TransportParameters {
@@ -63,17 +62,9 @@ TransportParameters {
6362
2,
6463
),
6564
),
66-
original_destination_connection_id: DisabledParameter(
67-
PhantomData,
68-
),
69-
stateless_reset_token: DisabledParameter(
70-
PhantomData,
71-
),
72-
preferred_address: DisabledParameter(
73-
PhantomData,
74-
),
65+
original_destination_connection_id: DisabledParameter,
66+
stateless_reset_token: DisabledParameter,
67+
preferred_address: DisabledParameter,
7568
initial_source_connection_id: None,
76-
retry_source_connection_id: DisabledParameter(
77-
PhantomData,
78-
),
69+
retry_source_connection_id: DisabledParameter,
7970
}

quic/s2n-quic-core/src/transport/parameters/snapshots/s2n_quic_core__transport__parameters__tests__load_client_limits.snap

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
source: quic/s2n-quic-core/src/transport/parameters/tests.rs
3-
assertion_line: 154
43
expression: params
54
---
65
TransportParameters {
@@ -63,17 +62,9 @@ TransportParameters {
6362
2,
6463
),
6564
),
66-
original_destination_connection_id: DisabledParameter(
67-
PhantomData,
68-
),
69-
stateless_reset_token: DisabledParameter(
70-
PhantomData,
71-
),
72-
preferred_address: DisabledParameter(
73-
PhantomData,
74-
),
65+
original_destination_connection_id: DisabledParameter,
66+
stateless_reset_token: DisabledParameter,
67+
preferred_address: DisabledParameter,
7568
initial_source_connection_id: None,
76-
retry_source_connection_id: DisabledParameter(
77-
PhantomData,
78-
),
69+
retry_source_connection_id: DisabledParameter,
7970
}

quic/s2n-quic/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ zerocopy-derive = { version = "=0.3.0", optional = true }
6666
zeroize = { version = "1", optional = true, default-features = false }
6767

6868
[dev-dependencies]
69-
bolero = { version = "0.7" }
69+
bolero = { version = "0.8" }
7070
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing", "event-tracing"] }
7171
s2n-quic-platform = { path = "../s2n-quic-platform", features = ["testing"] }
7272
tokio = { version = "1", features = ["full"] }

0 commit comments

Comments
 (0)