Skip to content

Commit f13f040

Browse files
authored
chore: bump MSRV to 1.82.0 (#2654)
1 parent 8f54b57 commit f13f040

File tree

50 files changed

+78
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+78
-104
lines changed

.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
msrv = "1.75.0"
1+
msrv = "1.82.0"
22
# // https://github.com/aws/s2n-quic/pull/2251
33
too-many-arguments-threshold = 100

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
111111

112112
`s2n-quic` will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV.
113113

114-
The current MSRV is [1.75.0][msrv-url].
114+
The current MSRV is [1.82.0][msrv-url].
115115

116116
## Security issue notifications
117117

@@ -134,5 +134,5 @@ This project is licensed under the [Apache-2.0 License][license-url].
134134
[docs-url]: https://docs.rs/s2n-quic
135135
[dependencies-badge]: https://img.shields.io/librariesio/release/cargo/s2n-quic.svg
136136
[dependencies-url]: https://crates.io/crates/s2n-quic/dependencies
137-
[msrv-badge]: https://img.shields.io/badge/MSRV-1.75.0-green
138-
[msrv-url]: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html
137+
[msrv-badge]: https://img.shields.io/badge/MSRV-1.82.0-green
138+
[msrv-url]: https://blog.rust-lang.org/2024/10/17/Rust-1.82.0/

common/s2n-codec/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Internal crate used by s2n-quic"
55
repository = "https://github.com/aws/s2n-quic"
66
authors = ["AWS s2n"]
77
edition = "2021"
8-
rust-version = "1.75"
8+
rust-version = "1.82"
99
license = "Apache-2.0"
1010
# Exclude corpus files when publishing to crates.io
1111
exclude = ["corpus.tar.gz"]

dc/s2n-quic-dc-benches/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish = false
66

77
[dependencies]
88
aws-lc-rs = "1.12"
9-
criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
9+
criterion = { version = "0.6", features = ["html_reports", "async_tokio"] }
1010
s2n-codec = { path = "../../common/s2n-codec" }
1111
s2n-quic-dc = { path = "../s2n-quic-dc", features = ["testing"] }
1212
tokio = { version = "1", features = ["full"] }

dc/s2n-quic-dc-benches/src/crypto/encrypt.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use criterion::{black_box, BenchmarkId, Criterion, Throughput};
4+
use criterion::{BenchmarkId, Criterion, Throughput};
5+
use std::hint::black_box;
56

67
pub fn benchmarks(c: &mut Criterion) {
78
let mut group = c.benchmark_group("crypto/encrypt");

dc/s2n-quic-dc-benches/src/crypto/hkdf.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use criterion::{black_box, BenchmarkId, Criterion, Throughput};
4+
use criterion::{BenchmarkId, Criterion, Throughput};
5+
use std::hint::black_box;
56

67
pub fn benchmarks(c: &mut Criterion) {
78
psk(c);

dc/s2n-quic-dc-benches/src/crypto/hmac.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use criterion::{black_box, Criterion, Throughput};
4+
use criterion::{Criterion, Throughput};
5+
use std::hint::black_box;
56

67
pub fn benchmarks(c: &mut Criterion) {
78
init(c);

dc/s2n-quic-dc-benches/src/datagram/recv.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
use criterion::{black_box, BenchmarkId, Criterion};
4+
use criterion::{BenchmarkId, Criterion};
5+
use std::hint::black_box;
56

67
const PACKET: [u8; 90] = [
78
64, 0, 42, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 55, 67, 102, 47, 62, 183, 50, 8, 44,

dc/s2n-quic-dc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Internal crate used by s2n-quic"
55
repository = "https://github.com/aws/s2n-quic"
66
authors = ["AWS s2n"]
77
edition = "2021"
8-
rust-version = "1.75"
8+
rust-version = "1.82"
99
license = "Apache-2.0"
1010
# Exclude corpus files when publishing to crates.io
1111
exclude = ["corpus.tar.gz"]

dc/s2n-quic-dc/src/path/secret/map/state/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl Model {
151151
if let Invariant::ContainsId(id) = invariant {
152152
if state
153153
.get_by_id_untracked(id)
154-
.map_or(true, |v| v.retired_at().is_some())
154+
.is_none_or(|v| v.retired_at().is_some())
155155
{
156156
invalidated.push(*id);
157157
return false;

0 commit comments

Comments
 (0)