From 5f66282e48d8cbef18db91bc1fc34fa54f8d9e51 Mon Sep 17 00:00:00 2001 From: Kornel Date: Sun, 1 Oct 2023 00:54:57 +0100 Subject: [PATCH] Bump MSRV Fixes #3256 --- .github/workflows/rav1e.yml | 10 +++++----- Cargo.toml | 2 +- README.md | 2 +- build.rs | 2 +- clippy.toml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rav1e.yml b/.github/workflows/rav1e.yml index ddbec68bb5..ff5ea5713d 100644 --- a/.github/workflows/rav1e.yml +++ b/.github/workflows/rav1e.yml @@ -35,7 +35,7 @@ jobs: matrix: conf: - beta-build - - 1.65.0-tests + - 1.70.0-tests - aom-tests - dav1d-tests - no-asm-tests @@ -50,8 +50,8 @@ jobs: include: - conf: beta-build toolchain: beta - - conf: 1.65.0-tests - toolchain: 1.65.0 + - conf: 1.70.0-tests + toolchain: 1.70.0 - conf: aom-tests toolchain: stable - conf: dav1d-tests @@ -169,8 +169,8 @@ jobs: - name: Start sccache server run: | sccache --start-server - - name: Run 1.65.0 tests - if: matrix.toolchain == '1.65.0' && matrix.conf == '1.65.0-tests' + - name: Run 1.70.0 tests + if: matrix.toolchain == '1.70.0' && matrix.conf == '1.70.0-tests' run: | cargo test --workspace --verbose \ --features=decode_test,decode_test_dav1d,quick_test,capi diff --git a/Cargo.toml b/Cargo.toml index 9a1a82e8f3..d3fb81a163 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "rav1e" version = "0.6.1" authors = ["Thomas Daede "] edition = "2021" -rust-version = "1.65.0" +rust-version = "1.70.0" build = "build.rs" include = [ "/Cargo.toml", diff --git a/README.md b/README.md index 1f615488dd..ba734a0a66 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ For the foreseeable future, a weekly pre-release of rav1e will be [published](ht ### Toolchain: Rust -rav1e currently requires Rust 1.65.0 or later to build. +rav1e currently requires Rust 1.70.0 or later to build. ### Dependency: NASM Some `x86_64`-specific optimizations require [NASM](https://nasm.us/) `2.14.02` or newer and are enabled by default. diff --git a/build.rs b/build.rs index 738a72402f..72d548b118 100644 --- a/build.rs +++ b/build.rs @@ -236,7 +236,7 @@ fn build_asm_files() { fn rustc_version_check() { // This should match the version in the CI // Make sure to updated README.md when this changes. - const REQUIRED_VERSION: &str = "1.65.0"; + const REQUIRED_VERSION: &str = "1.70.0"; if version().unwrap() < Version::parse(REQUIRED_VERSION).unwrap() { eprintln!("rav1e requires rustc >= {REQUIRED_VERSION}."); exit(1); diff --git a/clippy.toml b/clippy.toml index 110a1fdade..fbc5b5782b 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,4 +1,4 @@ too-many-arguments-threshold = 16 cognitive-complexity-threshold = 40 trivial-copy-size-limit = 16 # 128-bits = 2 64-bit registers -msrv = "1.65" +msrv = "1.70"