From f68948ffeb9767e139d13fd43303cac75334dceb Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Thu, 19 Dec 2024 21:25:00 -0800
Subject: [PATCH] Increase MSRV to 1.74.1

This will enable usage of the new tree-sitter-language crate.
---
 .github/workflows/test.yml | 10 +++++-----
 CHANGELOG.md               |  4 ++++
 Cargo.toml                 |  2 +-
 rust-toolchain.toml        |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 21b669b04..b74647644 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@1.66.0
+      uses: dtolnay/rust-toolchain@1.74.1
       with:
         targets: ${{ matrix.job.target }}
 
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.66.0
+      - uses: dtolnay/rust-toolchain@1.74.1
       # This runs tests that rely on the MIME database being present.
       - run: cargo test -- --ignored
 
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.66.0
+      - uses: dtolnay/rust-toolchain@1.74.1
       - name: Generate output for all sample files
         run: ./sample_files/compare_all.sh
       - name: Verify output is unchanged
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.66.0
+      - uses: dtolnay/rust-toolchain@1.74.1
       - run: cargo package --allow-dirty
 
   fmt:
@@ -102,7 +102,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.66.0
+      - uses: dtolnay/rust-toolchain@1.74.1
       - run: cargo fmt --all -- --check
 
   actionlint:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ffcebe69..5fee7ea61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ Improved language detection when one argument is a named pipe.
 
 Improved syntax highlighting, particularly for keywords.
 
+### Build
+
+difftastic now requires Rust 1.74.1 to build.
+
 ## 0.61 (released 24th October 2024)
 
 **Recommended git configuration has changed! Please update your
diff --git a/Cargo.toml b/Cargo.toml
index 5f84d5a3a..d0ab5374c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2021"
 # For reference, Debian stable is on 1.63 (see
 # https://tracker.debian.org/pkg/rustc) but Debian doesn't currently
 # package difftastic. Other distros are somewhat newer.
-rust-version = "1.66.0"
+rust-version = "1.74.1"
 include = [
         "/build.rs",
         "/src/",
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b4d3b7acb..6df45191c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.66"
+channel = "1.74.1"
 components = ["rustfmt"]
 profile = "minimal"