Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSRV 1.61 -> 1.63 #1902

Merged
merged 2 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.61"
toolchain: "1.63"

- run: cargo check --locked --lib --all-features -p rustls

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ to a wider set of architectures and environments, or compliance requirements. S
Specifying `default-features = false` when depending on rustls will remove the
dependency on aws-lc-rs.

Rustls requires Rust 1.61 or later.
Rustls requires Rust 1.63 or later.

[ring-target-platforms]: https://github.com/briansmith/ring/blob/2e8363b433fa3b3962c877d9ed2e9145612f3160/include/ring-core/target.h#L18-L64
[`crypto::CryptoProvider`]: https://docs.rs/rustls/latest/rustls/crypto/struct.CryptoProvider.html
Expand Down
2 changes: 1 addition & 1 deletion rustls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rustls"
version = "0.23.4"
edition = "2021"
rust-version = "1.61"
rust-version = "1.63"
license = "Apache-2.0 OR ISC OR MIT"
readme = "../README.md"
description = "Rustls is a modern TLS library written in Rust."
Expand Down
2 changes: 1 addition & 1 deletion rustls/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//! Specifying `default-features = false` when depending on rustls will remove the
//! dependency on aws-lc-rs.
//!
//! Rustls requires Rust 1.61 or later.
//! Rustls requires Rust 1.63 or later.
//!
//! [ring-target-platforms]: https://github.com/briansmith/ring/blob/2e8363b433fa3b3962c877d9ed2e9145612f3160/include/ring-core/target.h#L18-L64
//! [`crypto::CryptoProvider`]: crate::crypto::CryptoProvider
Expand Down
2 changes: 1 addition & 1 deletion rustls/src/server/hs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ impl ExpectClientHello {
.find_map(|maybe_skxg| match maybe_skxg {
Some(skxg) => suite
.usable_for_kx_algorithm(skxg.name().key_exchange_algorithm())
.then(|| *skxg),
.then_some(*skxg),
None => None,
});

Expand Down
2 changes: 1 addition & 1 deletion rustls/src/server/tls13.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ mod client_hello {

// See if there is a KeyShare for the selected kx group.
let chosen_share_and_kxg = shares_ext.iter().find_map(|share| {
(share.group == selected_kxg.name()).then(|| (share, selected_kxg))
(share.group == selected_kxg.name()).then_some((share, selected_kxg))
});

let chosen_share_and_kxg = match chosen_share_and_kxg {
Expand Down
2 changes: 1 addition & 1 deletion rustls/src/tls13/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Tls13CipherSuite {
/// Can a session using suite self resume from suite prev?
pub fn can_resume_from(&self, prev: &'static Self) -> Option<&'static Self> {
(prev.common.hash_provider.algorithm() == self.common.hash_provider.algorithm())
.then(|| prev)
.then_some(prev)
}

/// Return `true` if this is backed by a FIPS-approved implementation.
Expand Down
Loading