From 16fcc5de7c1a2c83e3ba8ed54aab9365e78e2aaa Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Sun, 28 Apr 2024 15:43:42 +0200 Subject: [PATCH] Increase MSRV to 1.70 It appears we can't find a system that ships rustc >= 1.67 and < 1.70, so keeping it at 1.67 gains nothing. 1.70 is used in Debian 13, so that will be able to build fish out of the box (12 was on 1.63 which was already too low). --- .cirrus.yml | 2 +- .github/workflows/main.yml | 8 ++++---- Cargo.toml | 2 +- README.rst | 2 +- debian/control | 2 +- doc_internal/rust-devel.md | 2 +- fish.spec.in | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8a6d83cdd..9b703cf47 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -103,7 +103,7 @@ freebsd_task: - mkdir build && cd build - chown -R fish-user .. - sudo -u fish-user -s whoami - # FreeBSD's pkg currently has rust 1.66.0 while we need rust 1.67.0+. Use rustup to install + # FreeBSD's pkg currently has rust 1.66.0 while we need rust 1.70.0+. Use rustup to install # the latest, but note that it only installs rust per-user. - sudo -u fish-user -s fetch -qo - https://sh.rustup.rs > rustup.sh - sudo -u fish-user -s sh ./rustup.sh -y --profile=minimal diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2c2fa609..f42198ef0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.67 + - uses: dtolnay/rust-toolchain@1.70 - name: Install deps run: | sudo apt install gettext libpcre2-dev python3-pip tmux @@ -43,7 +43,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.67 + - uses: dtolnay/rust-toolchain@1.70 with: targets: "i686-unknown-linux-gnu" # rust-toolchain wants this comma-separated - name: Install deps @@ -127,7 +127,7 @@ jobs: # # steps: # - uses: actions/checkout@v4 - # - uses: dtolnay/rust-toolchain@1.67 + # - uses: dtolnay/rust-toolchain@1.70 # - name: Install deps # run: | # sudo apt install gettext libpcre2-dev python3-pip tmux @@ -154,7 +154,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.67 + - uses: dtolnay/rust-toolchain@1.70 - name: Install deps run: | # --break-system-packages because homebrew has now declared itself "externally managed". diff --git a/Cargo.toml b/Cargo.toml index be7d073bc..85e669717 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = [ ] [workspace.package] -rust-version = "1.67" +rust-version = "1.70" edition = "2021" [profile.release] diff --git a/README.rst b/README.rst index b3458fab6..98c74c362 100644 --- a/README.rst +++ b/README.rst @@ -138,7 +138,7 @@ Dependencies, git master Building from git master currently requires, in addition to the dependencies for a tarball: -- Rust (version 1.67 or later) +- Rust (version 1.70 or later) - CMake (version 3.19 or later) - libclang, even if you are compiling with GCC - an Internet connection diff --git a/debian/control b/debian/control index bb486502a..e5289c1b6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Adam # Debhelper should be bumped to >= 10 once Ubuntu Xenial is no longer supported Build-Depends: debhelper (>= 9.20160115), cmake (>= 3.5.0), gettext, libpcre2-dev, # Test dependencies - locales-all, python3, rustc (>= 1.67) | rustc-mozilla (>= 1.67), cargo + locales-all, python3, rustc (>= 1.70) | rustc-mozilla (>= 1.70), cargo Standards-Version: 4.1.5 Homepage: https://fishshell.com/ Vcs-Git: https://github.com/fish-shell/fish-shell.git diff --git a/doc_internal/rust-devel.md b/doc_internal/rust-devel.md index ac7d9545e..658a7e17e 100644 --- a/doc_internal/rust-devel.md +++ b/doc_internal/rust-devel.md @@ -18,7 +18,7 @@ We use forks of the last two - see the [FFI section](#ffi) below. No special act ### Build Dependencies -fish-shell currently depends on Rust 1.67 or later. To install Rust, follow https://rustup.rs. +fish-shell currently depends on Rust 1.70 or later. To install Rust, follow https://rustup.rs. ### Build via CMake diff --git a/fish.spec.in b/fish.spec.in index 22cea739d..774f7b7ce 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -10,7 +10,7 @@ URL: https://fishshell.com/ Source0: %{name}_@VERSION@.orig.tar.xz BuildRequires: cargo gettext gcc-c++ xz pcre2-devel -BuildRequires: rust >= 1.67 +BuildRequires: rust >= 1.70 %if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: cmake3