From f869e16954caaf18da8a912eebef0d7aa7d274ac Mon Sep 17 00:00:00 2001
From: Josh Holmer <jholmer.in@gmail.com>
Date: Sun, 23 Oct 2022 16:46:36 -0400
Subject: [PATCH] Bump minimum rustc to 1.60, required by clap 4

---
 .github/workflows/rav1e.yml | 10 +++++-----
 Cargo.toml                  |  2 +-
 README.md                   |  2 +-
 build.rs                    |  2 +-
 clippy.toml                 |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rav1e.yml b/.github/workflows/rav1e.yml
index 6e1839d58e..f59560b84f 100644
--- a/.github/workflows/rav1e.yml
+++ b/.github/workflows/rav1e.yml
@@ -39,7 +39,7 @@ jobs:
       matrix:
         conf:
           - beta-build
-          - 1.59.0-tests
+          - 1.60.0-tests
           - aom-tests
           - dav1d-tests
           - no-asm-tests
@@ -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
@@ -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
diff --git a/Cargo.toml b/Cargo.toml
index 6b86e18ec2..320e7aafa4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "rav1e"
 version = "0.6.0"
 authors = ["Thomas Daede <tdaede@xiph.org>"]
 edition = "2021"
-rust-version = "1.59.0"
+rust-version = "1.60.0"
 build = "build.rs"
 include = [
     "/Cargo.toml",
diff --git a/README.md b/README.md
index 7ec7718dc2..45fed323d5 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.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.
diff --git a/build.rs b/build.rs
index 4ef2e518f5..dd557091dc 100644
--- a/build.rs
+++ b/build.rs
@@ -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);
diff --git a/clippy.toml b/clippy.toml
index f26dd286a7..2ef5862dea 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.59"
+trivial-copy-size-limit = 16        # 128-bits = 2 64-bit registers
+msrv = "1.60"