Skip to content

Commit

Permalink
Merge pull request #246 from tcharding/08-09-roll-back-msrv
Browse files Browse the repository at this point in the history
Roll back the MSRV to Rust 1.48
  • Loading branch information
marshallpierce authored Aug 26, 2023
2 parents d2e75a4 + a383018 commit b001749
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .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.57.0'
'rust:1.48.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 Expand Up @@ -89,7 +89,7 @@ jobs:
name: Build ARM with only alloc feature
command: cargo build --target thumbv6m-none-eabi --no-default-features --features alloc
- run:
# dev dependencies can't build on 1.57.0
# dev dependencies can't build on 1.48.0
name: Run tests
command: |
if [[ '<< parameters.toolchain_override >>' != '__msrv__' ]]
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ readme = "README.md"
keywords = ["base64", "utf8", "encode", "decode", "no_std"]
categories = ["encoding"]
license = "MIT OR Apache-2.0"
edition = "2021"
edition = "2018"
# dev-dependencies require 1.60, but the main code doesn't
rust-version = "1.57.0"
# This option was added in 1.56, keep it for when we bump MSRV.
rust-version = "1.48.0"

[[bench]]
name = "benchmarks"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ optionally may allow other behaviors.

## Rust version compatibility

The minimum supported Rust version is 1.57.0.
The minimum supported Rust version is 1.48.0.

# Contributing

Expand Down
2 changes: 1 addition & 1 deletion src/alphabet.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//! Provides [Alphabet] and constants for alphabets commonly used in the wild.
use crate::PAD_BYTE;
use core::convert::TryFrom;
use core::fmt;
#[cfg(any(feature = "std", test))]
use std::error;
Expand Down Expand Up @@ -202,7 +203,6 @@ pub const BIN_HEX: Alphabet = Alphabet::from_str_unchecked(
#[cfg(test)]
mod tests {
use crate::alphabet::*;
use std::convert::TryFrom as _;

#[test]
fn detects_duplicate_start() {
Expand Down

0 comments on commit b001749

Please sign in to comment.