Skip to content

Commit

Permalink
chore: Update MSRV to 1.70
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Aug 24, 2023
1 parent 88cf306 commit d30d94f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
@@ -1,4 +1,4 @@
msrv = "1.64.0" # MSRV
msrv = "1.70.0" # MSRV
warn-on-all-wildcard-imports = true
allow-expect-in-tests = true
allow-unwrap-in-tests = true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Expand Up @@ -84,7 +84,7 @@ jobs:
build: [msrv, wasm, wasm-wasi, debug, release]
include:
- build: msrv
rust: 1.64.0 # MSRV
rust: 1.70.0 # MSRV
target: x86_64-unknown-linux-gnu
features: full
- build: wasm
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.64.0 # MSRV
toolchain: 1.70.0 # MSRV
- uses: Swatinem/rust-cache@v2
- name: UI Tests
run: make test-ui-${{ matrix.features }}
Expand All @@ -154,7 +154,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.64.0 # MSRV
toolchain: 1.70.0 # MSRV
- uses: Swatinem/rust-cache@v2
- name: Check documentation
env:
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.64.0 # MSRV
toolchain: 1.70.0 # MSRV
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Lint (ultra-minimal)
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -14,7 +14,7 @@ members = [
[workspace.package]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.64.0" # MSRV
rust-version = "1.70.0" # MSRV
include = [
"build.rs",
"src/**/*",
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
ARGS+=--target ${TOOLCHAIN_TARGET}
endif

MSRV?=1.64.0
MSRV?=1.70.0

_FEATURES = minimal default wasm full debug release
_FEATURES_minimal = --no-default-features --features "std"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -24,7 +24,7 @@
//! - Leverage feature flags to keep to one active branch
//! - Being under [WG-CLI](https://github.com/rust-cli/team/) to increase the bus factor
//! - We follow semver and will wait about 6-9 months between major breaking changes
//! - We will support the last two minor Rust releases (MSRV, currently 1.64.0)
//! - We will support the last two minor Rust releases (MSRV, currently 1.70.0)
//!
//! While these aspirations can be at odds with fast build times and low binary
//! size, we will still strive to keep these reasonable for the flexibility you
Expand Down
2 changes: 1 addition & 1 deletion tests/derive_ui.rs
Expand Up @@ -6,7 +6,7 @@
// option. This file may not be copied, modified, or distributed

#[cfg(feature = "derive")]
#[rustversion::attr(any(not(stable), before(1.64), since(1.65)), ignore)] // MSRV
#[rustversion::attr(any(not(stable), before(1.70), since(1.71)), ignore)] // MSRV
#[test]
fn ui() {
let t = trybuild::TestCases::new();
Expand Down

0 comments on commit d30d94f

Please sign in to comment.