From 781791c00c19d779801490695333ba859961cbc3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 10 Aug 2025 15:44:17 +0200
Subject: [PATCH] Revert "Add rust-toolchain.toml"

By default, we make every rustup user use our pinned version.  This might
not be ideal at this point, for a few reasons:
1. we don't have automatic Rust updates yet (see the parent commit),
   so this might unnecessarily install an old version. As a contributor,
   this feels irritating (newer versions are usually strictly better).
2. it will use more bandwidth and perhaps other resources during "git-bisect"
   scenarios
3. somehow rustup will download things redundantly; it will download "1.89.0"
   and "stable" even if they are identical. The user will need to clean
   those up at some point, even if they didn't add them explicitly.

See also
https://github.com/fish-shell/fish-shell/pull/11712#issuecomment-3165388330

Part of the motivation for rust-toolchain.toml is probably the regular
(every 6 weeks) failures due to the update check, but that failure has been
removed in the parent commit.

The other motivation ("fix the issue of local compiles running into lint
warnings from newer compilers") is a fair point but I think we should rather
fix warnings quickly.

Let's remove rust-toolchain.toml again until we have more agreement on what
we should do.

This reverts commits
* f806d35af82 (Ignore rust-toolchain.toml in CI, 2025-08-07)
* 9714b982623 (Explicitly use fully qualified rust version numbers, 2025-08-07)
* 921aaa07868 (Add rust-toolchain.toml, 2025-08-07)

Closes #11718
---
 .github/actions/rust-toolchain@oldest-supported/action.yml | 2 --
 .github/actions/rust-toolchain@stable/action.yml           | 5 +----
 .github/workflows/main.yml                                 | 2 --
 rust-toolchain.toml                                        | 3 ---
 4 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 rust-toolchain.toml

diff --git a/.github/actions/rust-toolchain@oldest-supported/action.yml b/.github/actions/rust-toolchain@oldest-supported/action.yml
index 4c9a005b9..cbdfe382b 100644
--- a/.github/actions/rust-toolchain@oldest-supported/action.yml
+++ b/.github/actions/rust-toolchain@oldest-supported/action.yml
@@ -20,5 +20,3 @@ runs:
       with:
         targets: ${{ inputs.targets }}
         components: ${{ inputs.components}}
-    - run: rm rust-toolchain.toml
-      shell: sh
diff --git a/.github/actions/rust-toolchain@stable/action.yml b/.github/actions/rust-toolchain@stable/action.yml
index 46f74ed26..4da4e365d 100644
--- a/.github/actions/rust-toolchain@stable/action.yml
+++ b/.github/actions/rust-toolchain@stable/action.yml
@@ -16,10 +16,7 @@ permissions:
 runs:
   using: "composite"
   steps:
-    # also update in rust-toolchain.toml
-    - uses: dtolnay/rust-toolchain@1.89.0
+    - uses: dtolnay/rust-toolchain@1.89
       with:
         targets: ${{ inputs.targets }}
         components: ${{ inputs.components }}
-    - run: rm rust-toolchain.toml
-      shell: sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9463b99e5..75ae68e6d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,6 @@ jobs:
         # Ensure that fish is available as an executable.
         PATH="$PWD/build:$PATH" build_tools/update_translations.fish --no-mo
         # Show diff output. Fail if there is any.
-        git restore --worktree rust-toolchain.toml
         git --no-pager diff --exit-code || { echo 'There are uncommitted changes after regenerating the gettext PO files. Make sure to update them via `build_tools/update_translations.fish --no-mo` after changing source files.'; exit 1; }
 
   ubuntu-32bit-static-pcre2:
@@ -88,7 +87,6 @@ jobs:
         # ASAN uses `cargo build -Zbuild-std` which requires the rust-src component
         # this is comma-separated
         components: rust-src
-    - run: rm rust-toolchain.toml
     - name: Install deps
       run: |
         sudo apt install gettext libpcre2-dev python3-pexpect tmux
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index bd30ff00d..000000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-# also update in .github/actions/rust-toolchain@stable/action.yml
-channel = "1.89.0"