diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index b642bfa79b..d4d580f454 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.59.0 + - uses: dtolnay/rust-toolchain@1.60.0 - run: cargo doc - name: Setup mdBook diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ed92e23da..6c51f30f14 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.59.0 + uses: dtolnay/rust-toolchain@1.60.0 with: targets: ${{ matrix.job.target }} @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.59.0 + - uses: dtolnay/rust-toolchain@1.60.0 # This runs tests that rely on the MIME database being present. - run: cargo test -- --ignored @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.59.0 + - uses: dtolnay/rust-toolchain@1.60.0 - name: Generate output for all sample files run: ./sample_files/compare_all.sh - name: Verify output is unchanged @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.59.0 + - uses: dtolnay/rust-toolchain@1.60.0 - run: cargo package --allow-dirty fmt: @@ -84,5 +84,5 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.59.0 + - uses: dtolnay/rust-toolchain@1.60.0 - run: cargo fmt --all -- --check diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f154e64d..2e4bdeb55c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ Windows and non-Windows flies. The option `--skip-unchanged` now has a corresponding environment option `DFT_SKIP_UNCHANGED`. +### Build + +Difftastic now requires Rust 1.60 to build. + ## 0.52 (released 8th October 2023) ### Parsing diff --git a/Cargo.toml b/Cargo.toml index c364cd93a4..80b971399f 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.59.0" +rust-version = "1.60.0" include = [ "/build.rs", "/src/", diff --git a/manual/src/installation.md b/manual/src/installation.md index 676ba597e9..b29c8eb994 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.59 or later. +requires Rust version 1.60 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 287c010982..8cee343540 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.59" +channel = "1.60" 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 8b2cedd125..c903492d99 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.59。 +Difftastic 使用 Rust 编写,所以你需安装 Rust。我推荐使用 [rustup](https://rustup.rs/) 安装 Rust。Difftastic 要求 Rust 版本不低于 1.60。 你也需要一个支持 C++14 的 C++ 编译器。如果你正在使用 GCC,则 GCC 版本至少为 8。