feat: update fish to 4.2.1-3.1

.cirrus.yml

@@ -1,65 +1,37 @@
 env:
-    CIRRUS_CLONE_DEPTH: 1
+    CIRRUS_CLONE_DEPTH: 100
     CI: 1
 
 linux_task:
     matrix:
         - name: alpine
           container: &step
-              image: ghcr.io/fish-shell/fish-ci/alpine:latest
+              image: ghcr.io/krobelus/fish-ci/alpine:latest
               memory: 4GB
-        - name: centos7
+        - name: ubuntu-oldest-supported
           container:
               <<: *step
-              image: ghcr.io/fish-shell/fish-ci/centos7:latest
-        - name: centos8
-          container:
-              <<: *step
-              image: ghcr.io/fish-shell/fish-ci/centos8:latest
-        - name: focal-32bit
-          container:
-              <<: *step
-              image: ghcr.io/fish-shell/fish-ci/focal-32bit:latest
-
+              image: ghcr.io/krobelus/fish-ci/ubuntu-oldest-supported:latest
     tests_script:
         # cirrus at times gives us 32 procs and 2 GB of RAM
         # Unrestriced parallelism results in OOM
         - lscpu || true
         - (cat /proc/meminfo | grep MemTotal) || true
         - mkdir build && cd build
-        - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 ..
-        - ninja -j 6 fish fish_tests
+        - FISH_TEST_MAX_CONCURRENCY=6 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
+        - ninja -j 6 fish
         - ninja fish_run_tests
-
-    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
-
-linux_arm_task:
-    matrix:
-        - name: focal-arm64
-          arm_container:
-              image: ghcr.io/fish-shell/fish-ci/focal-arm64
-              only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
-
-    tests_script:
-        # cirrus at times gives us 32 procs and 2 GB of RAM
-        # Unrestriced parallelism results in OOM
-        - lscpu || true
-        - (cat /proc/meminfo | grep MemTotal) || true
-        - mkdir build && cd build
-        - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 ..
-        - ninja -j 6 fish fish_tests
-        - file ./fish
-        - ninja fish_run_tests
-
     only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
 
 freebsd_task:
     matrix:
-        - name: FreeBSD 13
+        - name: FreeBSD Stable
           freebsd_instance:
-              image: freebsd-13-2-release-amd64
+              image: freebsd-14-3-release-amd64-ufs # updatecli.d/cirrus-freebsd.yml
     tests_script:
-        - pkg install -y cmake devel/pcre2 devel/ninja misc/py-pexpect git
+        - pkg install -y cmake-core devel/pcre2 devel/ninja gettext git-lite lang/rust misc/py-pexpect
+        # libclang.so is a required build dependency for rust-c++ ffi bridge
+        - pkg install -y llvm
         # BSDs have the following behavior: root may open or access files even if
         # the mode bits would otherwise disallow it. For example root may open()
         # a file with write privileges even if the file has mode 400. This breaks
@@ -70,8 +42,7 @@ freebsd_task:
         - mkdir build && cd build
         - chown -R fish-user ..
         - sudo -u fish-user -s whoami
-        - sudo -u fish-user -s cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=1 ..
-        - sudo -u fish-user -s ninja -j 6 fish fish_tests
+        - sudo -u fish-user -s FISH_TEST_MAX_CONCURRENCY=1 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
+        - sudo -u fish-user -s ninja -j 6 fish
         - sudo -u fish-user -s ninja fish_run_tests
-
     only_if: $CIRRUS_REPO_OWNER == 'fish-shell'

.clang-format

@@ -6,11 +6,3 @@
 BasedOnStyle: Google
 ColumnLimit: 100
 IndentWidth: 4
-
-# Place config.h first always.
-IncludeCategories:
-  - Regex: '^"config.h"'
-    Priority: -1
-
-# We don't want OCLint pragmas to be reformatted.
-CommentPragmas: '^!OCLINT'

.editorconfig

@@ -13,16 +13,20 @@ max_line_length = 100
 indent_style = tab
 
 [*.{md,rst}]
+max_line_length = unset
 trim_trailing_whitespace = false
 
-[*.{sh,ac}]
-indent_size = 2
+[*.sh]
+indent_size = 4
+
+[build_tools/release.sh]
+max_line_length = 72
 
 [Dockerfile]
 indent_size = 2
 
 [share/{completions,functions}/**.fish]
-max_line_length = none
+max_line_length = unset
 
-[{COMMIT_EDITMSG,git-revise-todo}]
-max_line_length = 80
+[{COMMIT_EDITMSG,git-revise-todo,*.jjdescription}]
+max_line_length = 72

.rustfmt.toml

@@ -0,0 +1 @@
+edition = "2024"

BSDmakefile

@@ -31,7 +31,7 @@ PREFIX?=/usr/local
 build/fish: build/$(BUILDFILE)
 	$(CMAKE) --build build
 
-# Don't split the mkdir into its own rule because that would cause CMake to regenerate the build 
+# Don't split the mkdir into its own rule because that would cause CMake to regenerate the build
 # files after each build (because it adds the mdate of the build directory into the out-of-date
 # calculation tree). GNUmake supports order-only dependencies, BSDmake does not seem to.
 build/$(BUILDFILE):
@@ -48,7 +48,11 @@ clean:
 
 .PHONY: test
 test: build/fish
-	$(CMAKE) --build build --target test
+	$(CMAKE) --build build --target fish_run_tests
+
+.PHONY: fish_run_tests
+fish_run_tests: build/fish
+	$(CMAKE) --build build --target fish_run_tests
 
 .PHONY: run
 run: build/fish