Skip to content

Commit 0996b81

Browse files
Merge branch 'master' into mp/invalid-padding
2 parents 790056e + 442a809 commit 0996b81

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ workflows:
1414
# be easier on the CI hosts since presumably those fat lower layers will already be cached, and
1515
# therefore faster than a minimal, customized alpine.
1616
# MSRV
17-
'rust:1.56.1'
17+
'rust:1.57.0'
1818
]
1919
# a hacky scheme to work around CircleCI's inability to deal with mutable docker tags, forcing us to
2020
# get a nightly or stable toolchain via rustup instead of a mutable docker tag

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ keywords = ["base64", "utf8", "encode", "decode", "no_std"]
1010
categories = ["encoding"]
1111
license = "MIT OR Apache-2.0"
1212
edition = "2018"
13-
rust-version = "1.56.1"
13+
rust-version = "1.57.0"
1414

1515
[[bench]]
1616
name = "benchmarks"
1717
harness = false
1818

1919
[dev-dependencies]
20-
criterion = "0.3.5"
20+
criterion = "0.4.0"
2121
rand = { version = "0.8.5", features = ["small_rng"] }
22+
# clap 4 would require 1.60
2223
structopt = "0.3.26"
2324
# test fixtures for engine tests
2425
rstest = "0.12.0"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ optionally may allow other behaviors.
7777

7878
## Rust version compatibility
7979

80-
The minimum required Rust version is 1.56.1.
80+
The minimum supported Rust version is 1.57.0.
8181

8282
# Contributing
8383

RELEASE-NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### Breaking changes
66

7-
- MSRV is now 1.56.1
7+
- Update MSRV to 1.57.0
88
- Decoding can now either ignore padding, require correct padding, or require no padding. The default is to require correct padding.
99
- The `NO_PAD` config now requires that padding be absent when decoding.
1010

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.56.1"
1+
msrv = "1.57.0"

0 commit comments

Comments
 (0)