Skip to content

Commit 31c5407

Browse files
committed
base64ct: bump edition to 2024 (MSRV 1.85); add back to workspace
We kept `base64ct` out of the toplevel workspace because we can't run tests on it with its previous MSRV of 1.81 because that compiler can't recognize the newer edition on all of the other crates in the workspace. We originally attempted this upgrade in #1670 but reverted it in #1702 due to complaints we received in #1695. Now that the needed MSRV of 1.85 is `N-2` of the current 1.87 stable, we can hopefully perform this upgrade without receiving as many complaints. Several other crates have bumped edition to 2024 already, and edition upgrades are a time when MSRV bumps like this should be expected.
1 parent ea64351 commit 31c5407

File tree

4 files changed

+26
-217
lines changed

4 files changed

+26
-217
lines changed

Cargo.lock

+18-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+5-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ resolver = "2"
33
members = [
44
"base16ct",
55
"base32ct",
6-
#"base64ct",
6+
"base64ct",
77
"cmpv2",
88
"cms",
99
"const-oid",
@@ -27,9 +27,6 @@ members = [
2727
"x509-cert/test-support",
2828
"x509-ocsp"
2929
]
30-
exclude = [
31-
"base64ct",
32-
]
3330

3431
[profile.dev]
3532
opt-level = 2
@@ -65,7 +62,7 @@ x509-ocsp = { path = "./x509-ocsp" }
6562

6663
# https://github.com/RustCrypto/signatures/pull/913
6764
# https://github.com/RustCrypto/signatures/pull/923
68-
ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
65+
ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
6966
rfc6979 = { git = "https://github.com/RustCrypto/signatures.git" }
7067
# https://github.com/RustCrypto/key-wraps/pull/34
7168
# https://github.com/RustCrypto/key-wraps/pull/35
@@ -78,10 +75,10 @@ ansi-x963-kdf = { git = "https://github.com/RustCrypto/KDFs.git" }
7875

7976

8077
# https://github.com/RustCrypto/traits/pull/1777
81-
crypto-common = { git = "https://github.com/RustCrypto/traits.git" }
78+
crypto-common = { git = "https://github.com/RustCrypto/traits.git" }
8279
elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
83-
signature = { git = "https://github.com/RustCrypto/traits.git" }
84-
aead = { git = "https://github.com/RustCrypto/traits.git" }
80+
signature = { git = "https://github.com/RustCrypto/traits.git" }
81+
aead = { git = "https://github.com/RustCrypto/traits.git" }
8582

8683
# https://github.com/RustCrypto/RSA/pull/478
8784
# https://github.com/RustCrypto/RSA/pull/504

base64ct/Cargo.lock

-204
This file was deleted.

base64ct/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "base64ct"
3-
version = "1.7.3"
3+
version = "1.8.0-pre"
44
description = """
55
Pure Rust implementation of Base64 (RFC 4648) which avoids any usages of
66
data-dependent branches/LUTs and thereby provides portable "best effort"
@@ -14,8 +14,8 @@ repository = "https://github.com/RustCrypto/formats"
1414
categories = ["cryptography", "encoding", "no-std", "parser-implementations"]
1515
keywords = ["crypto", "base64", "pem", "phc"]
1616
readme = "README.md"
17-
edition = "2021"
18-
rust-version = "1.81"
17+
edition = "2024"
18+
rust-version = "1.85"
1919

2020
[dev-dependencies]
2121
base64 = "0.22"

0 commit comments

Comments
 (0)