Skip to content

Commit d8ee4e6

Browse files
camshaftcamshaft
authored
fix: clippy fixes for rustc 1.79 (#2250)
1 parent c25b075 commit d8ee4e6

File tree

36 files changed

+76
-78
lines changed

36 files changed

+76
-78
lines changed

‎common/s2n-codec/src/encoder/value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub trait EncoderValue: Sized {
2121
/// Returns the encoding size with no buffer constrains
2222
#[inline]
2323
fn encoding_size(&self) -> usize {
24-
self.encoding_size_for_encoder(&EncoderLenEstimator::new(core::usize::MAX))
24+
self.encoding_size_for_encoder(&EncoderLenEstimator::new(usize::MAX))
2525
}
2626

2727
/// Returns the encoding size for the given encoder's capacity

‎common/s2n-codec/src/testing/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ mod tests {
217217

218218
#[test]
219219
fn u8_round_trip_value_test() {
220-
for i in 0..=core::u8::MAX {
220+
for i in 0..=u8::MAX {
221221
ensure_codec_round_trip_value!(u8, i).unwrap();
222222
}
223223
}
224224

225225
#[test]
226226
fn u8_round_trip_bytes_test() {
227-
let bytes = (0..=core::u8::MAX).collect::<Vec<_>>();
227+
let bytes = (0..=u8::MAX).collect::<Vec<_>>();
228228
ensure_codec_round_trip_bytes!(u8, &bytes).unwrap();
229229
}
230230

‎quic/s2n-quic-core/src/ack/ranges.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl Ranges {
9595
(Some(min), Some(max)) => {
9696
let min = PacketNumber::as_varint(min);
9797
let max = PacketNumber::as_varint(max);
98-
(max - min).try_into().unwrap_or(core::usize::MAX)
98+
(max - min).try_into().unwrap_or(usize::MAX)
9999
}
100100
_ => 0,
101101
}

‎quic/s2n-quic-core/src/crypto/label.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub const QUIC_KU_48: [u8; 17] = hex!("00300d746c7331332071756963206b7500");
5858
pub fn compute_label<T: Extend<u8>>(len: usize, label: &[u8], out: &mut T) {
5959
const TLS_LABEL: &[u8] = b"tls13 ";
6060
let label_len = TLS_LABEL.len() + label.len();
61-
debug_assert!(label_len <= core::u8::MAX as usize, "label is too long");
61+
debug_assert!(label_len <= u8::MAX as usize, "label is too long");
6262

6363
out.extend((len as u16).to_be_bytes().iter().cloned());
6464
out.extend(Some(label_len as u8));

‎quic/s2n-quic-core/src/frame/padding.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ pub struct Padding {
2929
impl Padding {
3030
/// The maximum padding allowed. When placed at the end of the packet
3131
/// all of the remaining bytes will be consumed.
32-
pub const MAX: Self = Self {
33-
length: core::usize::MAX,
34-
};
32+
pub const MAX: Self = Self { length: usize::MAX };
3533

3634
pub const fn tag(self) -> u8 {
3735
padding_tag!()

‎quic/s2n-quic-core/src/frame/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn round_trip() {
1414
for frame in frames {
1515
// make sure the frames encoding size matches what would actually
1616
// be written to an encoder
17-
let mut estimator = EncoderLenEstimator::new(core::usize::MAX);
17+
let mut estimator = EncoderLenEstimator::new(usize::MAX);
1818
frame.encode(&mut estimator);
1919
assert_eq!(frame.encoding_size(), estimator.len());
2020
}

‎quic/s2n-quic-core/src/interval_set/insert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn insert<T: IntervalBound + Ord>(
1919
// this range is intentionally invalid and will only be
2020
// valid if the `scan` method finds a match
2121
#[allow(clippy::reversed_empty_ranges)]
22-
let replace_range = core::usize::MAX..0;
22+
let replace_range = usize::MAX..0;
2323

2424
let mut insertion = Insertion { replace_range };
2525

‎quic/s2n-quic-core/src/interval_set/interval.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ macro_rules! integer_bounds {
305305
#[inline]
306306
fn steps_between(&self, upper: &Self) -> usize {
307307
use core::convert::TryInto;
308-
(upper - self).try_into().unwrap_or(core::usize::MAX)
308+
(upper - self).try_into().unwrap_or(usize::MAX)
309309
}
310310

311311
#[inline]

‎quic/s2n-quic-core/src/interval_set/remove.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn remove<T: IntervalBound + Ord>(
1919
// this range is intentionally invalid and will only be
2020
// valid if the `scan` method finds a match
2121
#[allow(clippy::reversed_empty_ranges)]
22-
let replace_range = core::usize::MAX..0;
22+
let replace_range = usize::MAX..0;
2323

2424
let can_push_range = limit.map(|l| l.get() > ranges.len() + 1).unwrap_or(true);
2525

‎quic/s2n-quic-core/src/io/rx/pair.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ where
7474
// See https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=9a32abe85c666f36fb2ec86496cc41b4
7575
//
7676
// Once https://github.com/aws/s2n-quic/issues/1742 is resolved this code can go away
77-
(core::mem::transmute(a), core::mem::transmute(b))
77+
(
78+
core::mem::transmute::<&mut <A as Rx>::Queue, &mut <A as Rx>::Queue>(a),
79+
core::mem::transmute::<&mut <B as Rx>::Queue, &mut <B as Rx>::Queue>(b),
80+
)
7881
};
7982

8083
let mut queue = Queue { a, b };

‎quic/s2n-quic-core/src/io/tx/handle_map.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,12 @@ where
4949
// See https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=9a32abe85c666f36fb2ec86496cc41b4
5050
//
5151
// Once https://github.com/aws/s2n-quic/issues/1742 is resolved this code can go away
52-
(core::mem::transmute(map), core::mem::transmute(tx))
52+
(
53+
core::mem::transmute::<&mut Map, &mut Map>(map),
54+
core::mem::transmute::<&mut <Tx as tx::Tx>::Queue, &mut <Tx as tx::Tx>::Queue>(
55+
tx,
56+
),
57+
)
5358
};
5459

5560
let mut queue = Queue {

‎quic/s2n-quic-core/src/io/tx/router.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,15 @@ where
8888
//
8989
// Once https://github.com/aws/s2n-quic/issues/1742 is resolved this code can go away
9090
(
91-
core::mem::transmute(router),
92-
core::mem::transmute(a),
93-
core::mem::transmute(b),
91+
core::mem::transmute::<&mut R, &mut R>(router),
92+
core::mem::transmute::<
93+
&mut <A as tx::Tx>::Queue,
94+
&mut <A as tx::Tx>::Queue,
95+
>(a),
96+
core::mem::transmute::<
97+
&mut <B as tx::Tx>::Queue,
98+
&mut <B as tx::Tx>::Queue,
99+
>(b),
94100
)
95101
};
96102

‎quic/s2n-quic-core/src/packet/number/packet_number.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use bolero_generator::*;
2222

2323
const PACKET_SPACE_BITLEN: usize = 2;
2424
const PACKET_SPACE_SHIFT: usize = (size_of::<PacketNumber>() * 8) - PACKET_SPACE_BITLEN;
25-
const PACKET_NUMBER_MASK: u64 = core::u64::MAX >> PACKET_SPACE_BITLEN;
25+
const PACKET_NUMBER_MASK: u64 = u64::MAX >> PACKET_SPACE_BITLEN;
2626

2727
/// Contains a fully-decoded packet number in a given space
2828
///
@@ -208,15 +208,15 @@ mod tests {
208208
VarInt::from_u8(0),
209209
VarInt::from_u8(1),
210210
VarInt::from_u8(2),
211-
VarInt::from_u8(core::u8::MAX / 2),
212-
VarInt::from_u8(core::u8::MAX - 1),
213-
VarInt::from_u8(core::u8::MAX),
214-
VarInt::from_u16(core::u16::MAX / 2),
215-
VarInt::from_u16(core::u16::MAX - 1),
216-
VarInt::from_u16(core::u16::MAX),
217-
VarInt::from_u32(core::u32::MAX / 2),
218-
VarInt::from_u32(core::u32::MAX - 1),
219-
VarInt::from_u32(core::u32::MAX),
211+
VarInt::from_u8(u8::MAX / 2),
212+
VarInt::from_u8(u8::MAX - 1),
213+
VarInt::from_u8(u8::MAX),
214+
VarInt::from_u16(u16::MAX / 2),
215+
VarInt::from_u16(u16::MAX - 1),
216+
VarInt::from_u16(u16::MAX),
217+
VarInt::from_u32(u32::MAX / 2),
218+
VarInt::from_u32(u32::MAX - 1),
219+
VarInt::from_u32(u32::MAX),
220220
VarInt::MAX,
221221
];
222222

‎quic/s2n-quic-core/src/packet/number/packet_number_range.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ mod test {
177177
#[test]
178178
fn end_is_max_packet_number() {
179179
let start = PacketNumberSpace::Handshake
180-
.new_packet_number(VarInt::new((u64::max_value() >> 2) - 1).unwrap());
181-
let end = PacketNumberSpace::Handshake
182-
.new_packet_number(VarInt::new(u64::max_value() >> 2).unwrap());
180+
.new_packet_number(VarInt::new((u64::MAX >> 2) - 1).unwrap());
181+
let end =
182+
PacketNumberSpace::Handshake.new_packet_number(VarInt::new(u64::MAX >> 2).unwrap());
183183

184184
assert_eq!(2, PacketNumberRange::new(start, end).count());
185185
}

‎quic/s2n-quic-core/src/path/mtu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub mod testing {
4444

4545
/// Creates a new mtu::Controller with the given mtu and probed size
4646
pub fn test_controller(mtu: u16, probed_size: u16) -> Controller {
47-
let mut controller = new_controller(u16::max_value());
47+
let mut controller = new_controller(u16::MAX);
4848
controller.plpmtu = mtu;
4949
controller.probed_size = probed_size;
5050
controller

‎quic/s2n-quic-core/src/random.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub mod testing {
5858
}
5959

6060
fn private_random_fill(&mut self, dest: &mut [u8]) {
61-
let seed = u8::max_value() - self.0;
61+
let seed = u8::MAX - self.0;
6262

6363
for (i, elem) in dest.iter_mut().enumerate() {
6464
*elem = seed ^ i as u8;

‎quic/s2n-quic-core/src/recovery/congestion_controller.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub mod testing {
300300
type PacketInfo = PacketInfo;
301301

302302
fn congestion_window(&self) -> u32 {
303-
u32::max_value()
303+
u32::MAX
304304
}
305305

306306
fn bytes_in_flight(&self) -> u32 {

‎quic/s2n-quic-core/src/stream/ops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ pub mod rx {
281281
Self {
282282
chunks: None,
283283
low_watermark: 0,
284-
high_watermark: core::usize::MAX,
284+
high_watermark: usize::MAX,
285285
stop_sending: None,
286286
detached: false,
287287
}

‎quic/s2n-quic-core/src/time/timestamp.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl Timestamp {
108108
#[inline]
109109
fn from_duration_impl(duration: Duration) -> Self {
110110
// 2^64 microseconds is ~580,000 years so casting from a u128 should be ok
111-
debug_assert!(duration.as_micros() <= core::u64::MAX.into());
111+
debug_assert!(duration.as_micros() <= u64::MAX.into());
112112
let micros = duration.as_micros() as u64;
113113
// if the value is 0 then round up to 1us after the epoch
114114
let micros = NonZeroU64::new(micros).unwrap_or(ONE_MICROSECOND);
@@ -225,13 +225,11 @@ mod tests {
225225
let ts2 = ts1 - Duration::from_millis(110);
226226
assert_eq!(Duration::from_millis(440), ts2 - initial);
227227
// Checked Sub
228-
assert!(ts2
229-
.checked_sub(Duration::from_secs(std::u64::MAX))
230-
.is_none());
228+
assert!(ts2.checked_sub(Duration::from_secs(u64::MAX)).is_none());
231229
assert_eq!(Some(initial), ts2.checked_sub(Duration::from_millis(440)));
232230
// Checked Add
233231
let max_duration =
234-
Duration::from_secs(std::u64::MAX) + (Duration::from_secs(1) - Duration::from_nanos(1));
232+
Duration::from_secs(u64::MAX) + (Duration::from_secs(1) - Duration::from_nanos(1));
235233
assert_eq!(None, ts2.checked_add(max_duration));
236234
assert!(ts2.checked_add(Duration::from_secs(24 * 60 * 60)).is_some());
237235

‎quic/s2n-quic-core/src/transmission/writer/testing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl OutgoingFrameBuffer {
140140
if self.max_buffer_size.is_some() {
141141
self.remaining_packet_space
142142
} else {
143-
core::usize::MAX
143+
usize::MAX
144144
}
145145
}
146146

‎quic/s2n-quic-core/src/transport/parameters/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn round_trip() {
1313
return;
1414
}
1515

16-
if input[0] > core::u8::MAX / 2 {
16+
if input[0] > u8::MAX / 2 {
1717
assert_codec_round_trip_bytes!(ClientTransportParameters, input[1..]);
1818
} else {
1919
assert_codec_round_trip_bytes!(ServerTransportParameters, input[1..]);

‎quic/s2n-quic-platform/src/io/testing/model.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl Model {
183183
}
184184

185185
fn rate_to_u64(rate: f64) -> u64 {
186-
let value = rate.max(0.0).min(1.0);
186+
let value = rate.clamp(0.0, 1.0);
187187
let value = value * u64::MAX as f64;
188188
value.round() as u64
189189
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ impl MessageTrait for mmsghdr {
2828
#[inline]
2929
fn payload_len(&self) -> usize {
3030
let payload_len = self.msg_len as usize;
31-
debug_assert!(payload_len <= core::u16::MAX as usize);
31+
debug_assert!(payload_len <= u16::MAX as usize);
3232
payload_len
3333
}
3434

3535
#[inline]
3636
unsafe fn set_payload_len(&mut self, len: usize) {
37-
debug_assert!(len <= core::u16::MAX as usize);
37+
debug_assert!(len <= u16::MAX as usize);
3838
self.msg_len = len as _;
3939
self.msg_hdr.set_payload_len(len);
4040
}
@@ -80,7 +80,7 @@ impl MessageTrait for mmsghdr {
8080
) -> Result<usize, tx::Error> {
8181
let len = self.msg_hdr.tx_write(message)?;
8282
// We need to replicate the len with the `msg_len` field after delegating to `msg_hdr`
83-
debug_assert!(len <= core::u16::MAX as usize);
83+
debug_assert!(len <= u16::MAX as usize);
8484
self.msg_len = len as _;
8585
Ok(len)
8686
}

‎quic/s2n-quic-qns/src/io.rs

+6
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ impl Server {
3939
// GSO isn't currently supported for XDP so just read it to avoid a dead_code warning
4040
let _ = self.disable_gso;
4141
let _ = self.max_mtu;
42+
let _ = self.initial_mtu;
43+
let _ = self.queue_recv_buffer_size;
44+
let _ = self.queue_send_buffer_size;
4245

4346
let addr = (self.ip, self.port).into();
4447

@@ -96,6 +99,9 @@ impl Client {
9699
// GSO isn't currently supported for XDP so just read it to avoid a dead_code warning
97100
let _ = self.disable_gso;
98101
let _ = self.max_mtu;
102+
let _ = self.initial_mtu;
103+
let _ = self.queue_recv_buffer_size;
104+
let _ = self.queue_send_buffer_size;
99105

100106
let addr = (self.local_ip, 0u16).into();
101107

‎quic/s2n-quic-transport/src/ack/ack_manager.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,13 +619,13 @@ mod tests {
619619
)
620620
.is_ok());
621621
manager.transmission_state = AckTransmissionState::Active { retransmissions: 0 };
622-
manager.transmissions_since_elicitation = Counter::new(u8::max_value());
622+
manager.transmissions_since_elicitation = Counter::new(u8::MAX);
623623

624624
manager.on_transmit_complete(&mut write_context);
625625

626626
assert_eq!(
627627
manager.transmissions_since_elicitation,
628-
Counter::new(u8::max_value())
628+
Counter::new(u8::MAX)
629629
);
630630
}
631631

‎quic/s2n-quic-transport/src/path/manager/tests.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ fn limit_number_of_connection_migrations() {
941941
let mut manager = manager_server(first_path);
942942
let mut total_paths = 1;
943943

944-
for i in 1..std::u8::MAX {
944+
for i in 1..u8::MAX {
945945
let new_addr: SocketAddr = format!("127.0.0.2:{}", i).parse().unwrap();
946946
let new_addr = SocketAddress::from(new_addr);
947947
let new_addr = RemoteAddress::from(new_addr);
@@ -1934,7 +1934,6 @@ pub fn helper_manager_with_paths_base(
19341934

19351935
Helper {
19361936
now,
1937-
first_expected_data,
19381937
second_expected_data,
19391938
challenge_expiration,
19401939
zero_path_id,
@@ -1964,7 +1963,6 @@ fn helper_manager_with_paths(publisher: &mut Publisher) -> Helper {
19641963

19651964
pub struct Helper {
19661965
pub now: Timestamp,
1967-
pub first_expected_data: challenge::Data,
19681966
pub second_expected_data: challenge::Data,
19691967
pub challenge_expiration: Duration,
19701968
pub zero_path_id: Id,

‎quic/s2n-quic-transport/src/space/application.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,7 @@ impl<Config: endpoint::Config> ApplicationSpace<Config> {
383383
config: PhantomData::<Config>,
384384
outcome: &mut outcome,
385385
packet_number,
386-
payload: transmission::connection_close::Payload {
387-
connection_close,
388-
packet_number_space: PacketNumberSpace::ApplicationData,
389-
},
386+
payload: transmission::connection_close::Payload { connection_close },
390387
timestamp: context.timestamp,
391388
transmission_constraint: transmission::Constraint::None,
392389
transmission_mode: transmission::Mode::Normal,

‎quic/s2n-quic-transport/src/space/handshake.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ impl<Config: endpoint::Config> HandshakeSpace<Config> {
136136
payload: transmission::early::Payload {
137137
ack_manager: &mut self.ack_manager,
138138
crypto_stream: &mut self.crypto_stream,
139-
packet_number_space: PacketNumberSpace::Handshake,
140139
recovery_manager: &mut self.recovery_manager,
141140
},
142141
timestamp: context.timestamp,
@@ -221,10 +220,7 @@ impl<Config: endpoint::Config> HandshakeSpace<Config> {
221220
config: PhantomData::<Config>,
222221
outcome: &mut outcome,
223222
packet_number,
224-
payload: transmission::connection_close::Payload {
225-
connection_close,
226-
packet_number_space: PacketNumberSpace::Handshake,
227-
},
223+
payload: transmission::connection_close::Payload { connection_close },
228224
timestamp: context.timestamp,
229225
transmission_constraint: transmission::Constraint::None,
230226
transmission_mode: transmission::Mode::Normal,

0 commit comments

Comments
 (0)