From 1a4313423d766369a118bb2e771a89df1d9da566 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Thu, 28 Aug 2025 09:41:30 +0100 Subject: [PATCH] Increase minimum Rust version --- .github/workflows/test.yml | 10 +++++----- CHANGELOG.md | 4 ++++ Cargo.toml | 5 ++++- manual/src/from_source.md | 2 +- rust-toolchain.toml | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1f725d840..b28bfea2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.74.1 + uses: dtolnay/rust-toolchain@1.75.0 with: targets: ${{ matrix.job.target }} @@ -58,7 +58,7 @@ jobs: steps: # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: dtolnay/rust-toolchain@1.74.1 + - uses: dtolnay/rust-toolchain@1.75.0 # This runs tests that rely on the MIME database being present. - run: cargo test -- --ignored @@ -77,7 +77,7 @@ jobs: steps: # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: dtolnay/rust-toolchain@1.74.1 + - uses: dtolnay/rust-toolchain@1.75.0 - name: Generate output for all sample files run: ./sample_files/compare_all.sh - name: Verify output is unchanged @@ -89,7 +89,7 @@ jobs: steps: # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: dtolnay/rust-toolchain@1.74.1 + - uses: dtolnay/rust-toolchain@1.75.0 - run: cargo package --allow-dirty fmt: @@ -98,7 +98,7 @@ jobs: steps: # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: dtolnay/rust-toolchain@1.74.1 + - uses: dtolnay/rust-toolchain@1.75.0 - run: cargo fmt --all -- --check actionlint: diff --git a/CHANGELOG.md b/CHANGELOG.md index 87b6801d1..fb432bc65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 0.65 (unreleased) +### Build + +difftastic now requires Rust 1.75 to build. + ### Parsing Updated Clojure, Common Lisp and Zig parsers. Improved parsing of diff --git a/Cargo.toml b/Cargo.toml index af25d6c9b..9e5886b8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,10 +12,13 @@ edition = "2021" # Goal: support at least 12 months of Rust versions, and be # conservative about upgrades to help packagers. # +# https://releases.rs/ is a useful website to see when different Rust +# versions were released. +# # 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.74.1" +rust-version = "1.75.0" include = [ "/build.rs", "/src/", diff --git a/manual/src/from_source.md b/manual/src/from_source.md index d2488f595..8a0c5a368 100644 --- a/manual/src/from_source.md +++ b/manual/src/from_source.md @@ -4,7 +4,7 @@ Difftastic is written in Rust, so you will need Rust installed. I recommend [rustup](https://rustup.rs/) to install Rust. Difftastic -requires Rust version 1.74.1 or later. +requires Rust version 1.75 or later. You will also need a C++ compiler that supports C++14. If you're using GCC, you need at least version 8. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6df45191c..198f7078f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.74.1" +channel = "1.75.0" components = ["rustfmt"] profile = "minimal"