summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilfred Hughes <me@wilfred.me.uk>2023-08-07 20:32:08 -0700
committerWilfred Hughes <me@wilfred.me.uk>2023-08-07 20:32:08 -0700
commit4fdc8eebcdfb8d98c2a120b3b8d661ed8abaa91b (patch)
tree881fd4d5f8587fc5ec0496e9c0538ce67331de2c
parentab1b87eebb15c65427fd5827f042454363dc08bf (diff)
Increase MSRV to 1.59
-rw-r--r--.github/workflows/deploy_docs.yml2
-rw-r--r--.github/workflows/test.yml14
-rw-r--r--CHANGELOG.md4
-rw-r--r--Cargo.toml2
-rw-r--r--manual/src/installation.md2
-rw-r--r--rust-toolchain.toml2
-rw-r--r--translation/zh-CN/manual-zh-CN/src/installation.md2
7 files changed, 16 insertions, 12 deletions
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index 3fc0387ad..5fb670e5c 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -27,7 +27,7 @@ jobs:
- name: Install jq
run: sudo apt-get install -y jq
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo doc
- name: Setup mdBook
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 262f57273..e4d9df2e3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo test
# This also runs tests that rely on the MIME database being
# present.
@@ -27,7 +27,7 @@ jobs:
# runs-on: ubuntu-20.04
# steps:
# - uses: actions/checkout@v3
- # - uses: dtolnay/rust-toolchain@1.58.0
+ # - uses: dtolnay/rust-toolchain@1.59.0
# - run: rustup target add aarch64-unknown-linux-gnu
# - run: sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
# - run: cargo build --target=aarch64-unknown-linux-gnu
@@ -37,7 +37,7 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo test
test_windows:
@@ -45,7 +45,7 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo test
regression_test:
@@ -53,7 +53,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- name: Generate output for all sample files
run: ./sample_files/compare_all.sh
- name: Verify output is unchanged
@@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo package --allow-dirty
fmt:
@@ -72,5 +72,5 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.58.0
+ - uses: dtolnay/rust-toolchain@1.59.0
- run: cargo fmt --all -- --check
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95d158d4c..f629549fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ Improved syntax hightling for Java built-in types.
Fixed an issue with runaway memory usage when the two files input
files had a large number of differences.
+### Build
+
+Difftastic now requires Rust 1.59 to build.
+
## 0.49 (release 26th July 2023)
### Parsing
diff --git a/Cargo.toml b/Cargo.toml
index 598ce12aa..eeac57043 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
# Goal: support at least 12 months of Rust versions, and also the Rust
# version on Debian stable:
# https://tracker.debian.org/pkg/rustc
-rust-version = "1.58.0"
+rust-version = "1.59.0"
include = [
"/build.rs",
"/src/",
diff --git a/manual/src/installation.md b/manual/src/installation.md
index 79901361f..676ba597e 100644
--- a/manual/src/installation.md
+++ b/manual/src/installation.md
@@ -28,7 +28,7 @@ $ brew install difftastic
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.58 or later.
+requires Rust version 1.59 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 f3e491959..287c01098 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
[toolchain]
-channel = "1.58"
+channel = "1.59"
components = ["rustfmt"]
profile = "minimal"
diff --git a/translation/zh-CN/manual-zh-CN/src/installation.md b/translation/zh-CN/manual-zh-CN/src/installation.md
index 9d51ffc92..8b2cedd12 100644
--- a/translation/zh-CN/manual-zh-CN/src/installation.md
+++ b/translation/zh-CN/manual-zh-CN/src/installation.md
@@ -22,7 +22,7 @@ $ brew install difftastic
### 要求
-Difftastic 使用 Rust 编写,所以你需安装 Rust。我推荐使用 [rustup](https://rustup.rs/) 安装 Rust。Difftastic 要求 Rust 版本不低于 1.58。
+Difftastic 使用 Rust 编写,所以你需安装 Rust。我推荐使用 [rustup](https://rustup.rs/) 安装 Rust。Difftastic 要求 Rust 版本不低于 1.59。
你也需要一个支持 C++14 的 C++ 编译器。如果你正在使用 GCC,则 GCC 版本至少为 8。