Skip to content

Commit

Permalink
Bump MSRV to 1.66
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilfred committed Oct 16, 2024
1 parent 09c5e64 commit f58c9e0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install jq
run: sudo apt-get install -y jq

- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.66.0
- run: cargo doc

- name: Setup mdBook
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@1.65.0
uses: dtolnay/rust-toolchain@1.66.0
with:
targets: ${{ matrix.job.target }}

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.66.0
# This runs tests that rely on the MIME database being present.
- run: cargo test -- --ignored

Expand All @@ -83,7 +83,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.66.0
- name: Generate output for all sample files
run: ./sample_files/compare_all.sh
- name: Verify output is unchanged
Expand All @@ -94,15 +94,15 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.66.0
- run: cargo package --allow-dirty

fmt:
name: Rustfmt
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.66.0
- run: cargo fmt --all -- --check

actionlint:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ version.**
Fixed a crash (introduced in 0.60) when the final line in a file does
not have a trailing newline and occurs more than once in the file.

### Build

difftastic now requires Rust 1.66 to build.

## 0.60 (released 1st August 2024)

### Diffing
Expand Down
15 changes: 6 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@ authors = ["Wilfred Hughes <[email protected]>"]
keywords = ["diff", "syntax"]
categories = ["development-tools", "command-line-utilities", "parser-implementations"]
edition = "2021"
# Goal: support at least 12 months of Rust versions, and also the Rust
# version on Debian stable (see https://tracker.debian.org/pkg/rustc,
# currently 1.63).
# Goal: support at least 12 months of Rust versions, and be
# conservative about upgrades to help packagers.
#
# Unfortunately tree-sitter 0.20.10 has an MSRV[1] of 1.65, and it has
# a bugfix[2] we want.
#
# 1: https://github.com/tree-sitter/tree-sitter/issues/2669
# 2: https://github.com/Wilfred/difftastic/issues/570
rust-version = "1.65.0"
# 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"
include = [
"/build.rs",
"/src/",
Expand Down
2 changes: 1 addition & 1 deletion manual/src/from_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.65 or later.
requires Rust version 1.66 or later.

You will also need a C++ compiler that supports C++14. If you're using
GCC, you need at least version 8.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.65"
channel = "1.66"
components = ["rustfmt"]
profile = "minimal"

0 comments on commit f58c9e0

Please sign in to comment.