Skip to content

Commit

Permalink
Bump minimum rustc to 1.60, required by clap 4
Browse files Browse the repository at this point in the history
  • Loading branch information
shssoichiro committed Oct 23, 2022
1 parent 0f52a93 commit f869e16
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/rav1e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
matrix:
conf:
- beta-build
- 1.59.0-tests
- 1.60.0-tests
- aom-tests
- dav1d-tests
- no-asm-tests
Expand All @@ -54,8 +54,8 @@ jobs:
include:
- conf: beta-build
toolchain: beta
- conf: 1.59.0-tests
toolchain: 1.59.0
- conf: 1.60.0-tests
toolchain: 1.60.0
- conf: aom-tests
toolchain: stable
- conf: dav1d-tests
Expand Down Expand Up @@ -157,8 +157,8 @@ jobs:
- name: Start sccache server
run: |
sccache --start-server
- name: Run 1.59.0 tests
if: matrix.toolchain == '1.59.0' && matrix.conf == '1.59.0-tests'
- name: Run 1.60.0 tests
if: matrix.toolchain == '1.60.0' && matrix.conf == '1.60.0-tests'
run: |
cargo test --workspace --verbose \
--features=decode_test,decode_test_dav1d,quick_test,capi
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "rav1e"
version = "0.6.0"
authors = ["Thomas Daede <[email protected]>"]
edition = "2021"
rust-version = "1.59.0"
rust-version = "1.60.0"
build = "build.rs"
include = [
"/Cargo.toml",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.0 or later to build.
rav1e currently requires Rust 1.60.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.
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,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.59.0";
const REQUIRED_VERSION: &str = "1.60.0";
if version().unwrap() < Version::parse(REQUIRED_VERSION).unwrap() {
eprintln!("rav1e requires rustc >= {}.", REQUIRED_VERSION);
exit(1);
Expand Down
4 changes: 2 additions & 2 deletions clippy.toml
Original file line number Diff line number Diff line change
@@ -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.59"
trivial-copy-size-limit = 16 # 128-bits = 2 64-bit registers
msrv = "1.60"

0 comments on commit f869e16

Please sign in to comment.