Skip to content

Commit

Permalink
Merge branch 'master' into mp/invalid-padding
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallpierce committed Nov 27, 2022
2 parents 790056e + 442a809 commit 0996b81
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workflows:
# be easier on the CI hosts since presumably those fat lower layers will already be cached, and
# therefore faster than a minimal, customized alpine.
# MSRV
'rust:1.56.1'
'rust:1.57.0'
]
# a hacky scheme to work around CircleCI's inability to deal with mutable docker tags, forcing us to
# get a nightly or stable toolchain via rustup instead of a mutable docker tag
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ keywords = ["base64", "utf8", "encode", "decode", "no_std"]
categories = ["encoding"]
license = "MIT OR Apache-2.0"
edition = "2018"
rust-version = "1.56.1"
rust-version = "1.57.0"

[[bench]]
name = "benchmarks"
harness = false

[dev-dependencies]
criterion = "0.3.5"
criterion = "0.4.0"
rand = { version = "0.8.5", features = ["small_rng"] }
# clap 4 would require 1.60
structopt = "0.3.26"
# test fixtures for engine tests
rstest = "0.12.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ optionally may allow other behaviors.

## Rust version compatibility

The minimum required Rust version is 1.56.1.
The minimum supported Rust version is 1.57.0.

# Contributing

Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Breaking changes

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

Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.56.1"
msrv = "1.57.0"

0 comments on commit 0996b81

Please sign in to comment.