git: 5ada834187a8 - main - shells/fish: 4.2.1

From: Alan Somers <asomers_at_FreeBSD.org>
Date: Fri, 14 Nov 2025 14:05:32 UTC
The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ada834187a8ccff226a16cc773647bbad158e26

commit 5ada834187a8ccff226a16cc773647bbad158e26
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2025-11-14 13:59:53 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2025-11-14 14:04:01 +0000

    shells/fish: 4.2.1
    
    There are many new features since 4.0.6.  See the Github release page
    for details.
    
    https://github.com/fish-shell/fish-shell/releases/tag/4.2.1
---
 shells/fish/Makefile                |   3 +-
 shells/fish/Makefile.crates         | 140 ++++++++++--------
 shells/fish/distinfo                | 286 +++++++++++++++++++++---------------
 shells/fish/files/patch-src_path.rs |  11 --
 shells/fish/pkg-plist               |  58 ++++++--
 5 files changed, 293 insertions(+), 205 deletions(-)

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 06857bf81257..bf9332b4f909 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fish
-DISTVERSION=	4.0.6
-PORTREVISION=	2
+DISTVERSION=	4.2.1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
diff --git a/shells/fish/Makefile.crates b/shells/fish/Makefile.crates
index 32fbba054465..3797ab59095e 100644
--- a/shells/fish/Makefile.crates
+++ b/shells/fish/Makefile.crates
@@ -1,78 +1,100 @@
-CARGO_CRATES=	allocator-api2-0.2.18 \
-		autocfg-1.4.0 \
-		bitflags-2.6.0 \
+CARGO_CRATES=	aho-corasick-1.1.3 \
+		allocator-api2-0.2.21 \
+		autocfg-1.5.0 \
+		bitflags-2.10.0 \
 		block-buffer-0.10.4 \
-		cc-1.1.30 \
-		cfg-if-1.0.0 \
+		bstr-1.12.0 \
+		cc-1.2.41 \
+		cfg-if-1.0.4 \
 		cfg_aliases-0.2.1 \
-		cpufeatures-0.2.14 \
+		cpufeatures-0.2.17 \
 		crypto-common-0.1.6 \
-		dashmap-5.5.3 \
 		digest-0.10.7 \
-		equivalent-1.0.1 \
-		errno-0.3.9 \
+		dirs-6.0.0 \
+		dirs-sys-0.5.0 \
+		equivalent-1.0.2 \
+		errno-0.3.14 \
+		fastrand-2.3.0 \
+		find-msvc-tools-0.1.4 \
 		fnv-1.0.7 \
-		foldhash-0.1.3 \
-		generic-array-0.14.7 \
-		hashbrown-0.14.5 \
-		hashbrown-0.15.0 \
-		jobserver-0.1.32 \
-		lazy_static-1.5.0 \
-		libc-0.2.159 \
-		lock_api-0.4.12 \
-		log-0.4.22 \
-		lru-0.12.5 \
-		memchr-2.7.4 \
+		foldhash-0.1.5 \
+		generic-array-0.14.9 \
+		getrandom-0.2.16 \
+		getrandom-0.3.4 \
+		globset-0.4.16 \
+		hashbrown-0.15.5 \
+		jobserver-0.1.34 \
+		libc-0.2.177 \
+		libredox-0.1.10 \
+		lock_api-0.4.14 \
+		log-0.4.28 \
+		lru-0.13.0 \
+		macro_rules_attribute-0.2.2 \
+		macro_rules_attribute-proc_macro-0.2.2 \
+		memchr-2.7.6 \
 		minimal-lexical-0.2.1 \
-		nix-0.29.0 \
+		nix-0.30.1 \
 		nom-7.1.3 \
 		num-traits-0.2.19 \
-		once_cell-1.20.2 \
-		parking_lot-0.12.3 \
-		parking_lot_core-0.9.10 \
-		phf-0.11.2 \
-		phf_codegen-0.11.2 \
-		phf_generator-0.11.2 \
-		phf_shared-0.11.2 \
-		pkg-config-0.3.31 \
-		portable-atomic-1.9.0 \
-		proc-macro2-1.0.87 \
-		quote-1.0.37 \
+		once_cell-1.21.3 \
+		option-ext-0.2.0 \
+		parking_lot-0.12.5 \
+		parking_lot_core-0.9.12 \
+		paste-1.0.15 \
+		phf-0.11.3 \
+		phf-0.12.1 \
+		phf_codegen-0.11.3 \
+		phf_codegen-0.12.1 \
+		phf_generator-0.11.3 \
+		phf_generator-0.12.1 \
+		phf_shared-0.11.3 \
+		phf_shared-0.12.1 \
+		pkg-config-0.3.32 \
+		portable-atomic-1.11.1 \
+		proc-macro2-1.0.101 \
+		quote-1.0.41 \
+		r-efi-5.3.0 \
 		rand-0.8.5 \
 		rand_core-0.6.4 \
-		redox_syscall-0.5.7 \
+		redox_syscall-0.5.18 \
+		redox_users-0.5.2 \
+		regex-automata-0.4.13 \
+		regex-syntax-0.8.8 \
 		rsconf-0.2.2 \
-		rust-embed-8.5.0 \
-		rust-embed-impl-8.5.0 \
-		rust-embed-utils-8.5.0 \
+		rust-embed-8.8.0 \
+		rust-embed-impl-8.8.0 \
+		rust-embed-utils-8.8.0 \
 		same-file-1.0.6 \
+		scc-2.4.0 \
 		scopeguard-1.2.0 \
-		serial_test-1.0.0 \
-		serial_test_derive-1.0.0 \
-		sha2-0.10.8 \
+		sdd-3.0.10 \
+		serde-1.0.228 \
+		serde_core-1.0.228 \
+		serde_derive-1.0.228 \
+		serial_test-3.2.0 \
+		serial_test_derive-3.2.0 \
+		sha2-0.10.9 \
+		shellexpand-3.1.1 \
 		shlex-1.3.0 \
-		siphasher-0.3.11 \
-		smallvec-1.13.2 \
-		syn-1.0.109 \
-		syn-2.0.79 \
+		siphasher-1.0.1 \
+		smallvec-1.15.1 \
+		syn-2.0.107 \
 		terminfo-0.9.0 \
-		typenum-1.17.0 \
-		unicode-ident-1.0.13 \
+		thiserror-2.0.17 \
+		thiserror-impl-2.0.17 \
+		typenum-1.19.0 \
+		unicode-ident-1.0.20 \
 		unicode-segmentation-1.12.0 \
-		unicode-width-0.2.0 \
+		unicode-width-0.2.2 \
+		unix_path-1.0.1 \
+		unix_str-1.0.0 \
 		version_check-0.9.5 \
 		walkdir-2.5.0 \
-		widestring-1.1.0 \
-		winapi-util-0.1.9 \
-		windows-sys-0.52.0 \
-		windows-sys-0.59.0 \
-		windows-targets-0.52.6 \
-		windows_aarch64_gnullvm-0.52.6 \
-		windows_aarch64_msvc-0.52.6 \
-		windows_i686_gnu-0.52.6 \
-		windows_i686_gnullvm-0.52.6 \
-		windows_i686_msvc-0.52.6 \
-		windows_x86_64_gnu-0.52.6 \
-		windows_x86_64_gnullvm-0.52.6 \
-		windows_x86_64_msvc-0.52.6 \
+		wasi-0.11.1+wasi-snapshot-preview1 \
+		wasip2-1.0.1+wasi-0.2.4 \
+		widestring-1.2.1 \
+		winapi-util-0.1.11 \
+		windows-link-0.2.1 \
+		windows-sys-0.61.2 \
+		wit-bindgen-0.46.0 \
 		pcre2,pcre2-sys@git+https://github.com/fish-shell/rust-pcre2?tag=0.2.9-utf32\#85b7afba1a9d9bd445779800e5bcafeb732e4421
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 12b30b655637..75e96c804f7f 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,159 +1,203 @@
-TIMESTAMP = 1757691125
-SHA256 (fish-4.0.6.tar.xz) = 125d9ce0dd8a3704dc0782925df34f0208bffc42af5f34914449d14c34b5dae1
-SIZE (fish-4.0.6.tar.xz) = 3057300
-SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
-SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
-SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
-SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
-SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
-SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
+TIMESTAMP = 1763042567
+SHA256 (fish-4.2.1.tar.xz) = 0f99222a3063377c91fbf78d9850edab7a0b91bdbed201cf79da48ea3a41f393
+SIZE (fish-4.2.1.tar.xz) = 3012808
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/allocator-api2-0.2.21.crate) = 683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923
+SIZE (rust/crates/allocator-api2-0.2.21.crate) = 63622
+SHA256 (rust/crates/autocfg-1.5.0.crate) = c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8
+SIZE (rust/crates/autocfg-1.5.0.crate) = 18729
+SHA256 (rust/crates/bitflags-2.10.0.crate) = 812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3
+SIZE (rust/crates/bitflags-2.10.0.crate) = 48427
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
-SHA256 (rust/crates/cc-1.1.30.crate) = b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945
-SIZE (rust/crates/cc-1.1.30.crate) = 84509
-SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
-SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/bstr-1.12.0.crate) = 234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4
+SIZE (rust/crates/bstr-1.12.0.crate) = 351557
+SHA256 (rust/crates/cc-1.2.41.crate) = ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7
+SIZE (rust/crates/cc-1.2.41.crate) = 91154
+SHA256 (rust/crates/cfg-if-1.0.4.crate) = 9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801
+SIZE (rust/crates/cfg-if-1.0.4.crate) = 9360
 SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
 SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
-SHA256 (rust/crates/cpufeatures-0.2.14.crate) = 608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0
-SIZE (rust/crates/cpufeatures-0.2.14.crate) = 13165
+SHA256 (rust/crates/cpufeatures-0.2.17.crate) = 59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280
+SIZE (rust/crates/cpufeatures-0.2.17.crate) = 13466
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
-SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
-SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
-SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
-SIZE (rust/crates/errno-0.3.9.crate) = 10690
+SHA256 (rust/crates/dirs-6.0.0.crate) = c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e
+SIZE (rust/crates/dirs-6.0.0.crate) = 14190
+SHA256 (rust/crates/dirs-sys-0.5.0.crate) = e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab
+SIZE (rust/crates/dirs-sys-0.5.0.crate) = 10157
+SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
+SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
+SHA256 (rust/crates/errno-0.3.14.crate) = 39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb
+SIZE (rust/crates/errno-0.3.14.crate) = 12002
+SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be
+SIZE (rust/crates/fastrand-2.3.0.crate) = 15076
+SHA256 (rust/crates/find-msvc-tools-0.1.4.crate) = 52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127
+SIZE (rust/crates/find-msvc-tools-0.1.4.crate) = 30817
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
-SHA256 (rust/crates/foldhash-0.1.3.crate) = f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2
-SIZE (rust/crates/foldhash-0.1.3.crate) = 13712
-SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
-SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
-SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
-SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
-SHA256 (rust/crates/hashbrown-0.15.0.crate) = 1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb
-SIZE (rust/crates/hashbrown-0.15.0.crate) = 136460
-SHA256 (rust/crates/jobserver-0.1.32.crate) = 48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0
-SIZE (rust/crates/jobserver-0.1.32.crate) = 27549
-SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
-SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
-SHA256 (rust/crates/libc-0.2.159.crate) = 561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5
-SIZE (rust/crates/libc-0.2.159.crate) = 755366
-SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
-SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
-SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24
-SIZE (rust/crates/log-0.4.22.crate) = 44027
-SHA256 (rust/crates/lru-0.12.5.crate) = 234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38
-SIZE (rust/crates/lru-0.12.5.crate) = 16047
-SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
-SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/foldhash-0.1.5.crate) = d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2
+SIZE (rust/crates/foldhash-0.1.5.crate) = 21901
+SHA256 (rust/crates/generic-array-0.14.9.crate) = 4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2
+SIZE (rust/crates/generic-array-0.14.9.crate) = 17439
+SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
+SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
+SHA256 (rust/crates/getrandom-0.3.4.crate) = 899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd
+SIZE (rust/crates/getrandom-0.3.4.crate) = 50932
+SHA256 (rust/crates/globset-0.4.16.crate) = 54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5
+SIZE (rust/crates/globset-0.4.16.crate) = 26533
+SHA256 (rust/crates/hashbrown-0.15.5.crate) = 9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1
+SIZE (rust/crates/hashbrown-0.15.5.crate) = 140908
+SHA256 (rust/crates/jobserver-0.1.34.crate) = 9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33
+SIZE (rust/crates/jobserver-0.1.34.crate) = 29013
+SHA256 (rust/crates/libc-0.2.177.crate) = 2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976
+SIZE (rust/crates/libc-0.2.177.crate) = 792045
+SHA256 (rust/crates/libredox-0.1.10.crate) = 416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb
+SIZE (rust/crates/libredox-0.1.10.crate) = 7332
+SHA256 (rust/crates/lock_api-0.4.14.crate) = 224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965
+SIZE (rust/crates/lock_api-0.4.14.crate) = 29249
+SHA256 (rust/crates/log-0.4.28.crate) = 34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432
+SIZE (rust/crates/log-0.4.28.crate) = 51131
+SHA256 (rust/crates/lru-0.13.0.crate) = 227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465
+SIZE (rust/crates/lru-0.13.0.crate) = 16305
+SHA256 (rust/crates/macro_rules_attribute-0.2.2.crate) = 65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520
+SIZE (rust/crates/macro_rules_attribute-0.2.2.crate) = 15330
+SHA256 (rust/crates/macro_rules_attribute-proc_macro-0.2.2.crate) = 670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30
+SIZE (rust/crates/macro_rules_attribute-proc_macro-0.2.2.crate) = 8271
+SHA256 (rust/crates/memchr-2.7.6.crate) = f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273
+SIZE (rust/crates/memchr-2.7.6.crate) = 97616
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/nix-0.29.0.crate) = 71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46
-SIZE (rust/crates/nix-0.29.0.crate) = 318248
+SHA256 (rust/crates/nix-0.30.1.crate) = 74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6
+SIZE (rust/crates/nix-0.30.1.crate) = 342015
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
 SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
-SHA256 (rust/crates/once_cell-1.20.2.crate) = 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775
-SIZE (rust/crates/once_cell-1.20.2.crate) = 33394
-SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
-SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
-SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
-SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
-SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
-SIZE (rust/crates/phf-0.11.2.crate) = 21569
-SHA256 (rust/crates/phf_codegen-0.11.2.crate) = e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a
-SIZE (rust/crates/phf_codegen-0.11.2.crate) = 12977
-SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
-SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
-SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
-SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
-SHA256 (rust/crates/pkg-config-0.3.31.crate) = 953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2
-SIZE (rust/crates/pkg-config-0.3.31.crate) = 20880
-SHA256 (rust/crates/portable-atomic-1.9.0.crate) = cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2
-SIZE (rust/crates/portable-atomic-1.9.0.crate) = 166365
-SHA256 (rust/crates/proc-macro2-1.0.87.crate) = b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a
-SIZE (rust/crates/proc-macro2-1.0.87.crate) = 49121
-SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af
-SIZE (rust/crates/quote-1.0.37.crate) = 28558
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
+SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
+SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
+SHA256 (rust/crates/parking_lot-0.12.5.crate) = 93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a
+SIZE (rust/crates/parking_lot-0.12.5.crate) = 46735
+SHA256 (rust/crates/parking_lot_core-0.9.12.crate) = 2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1
+SIZE (rust/crates/parking_lot_core-0.9.12.crate) = 34110
+SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
+SIZE (rust/crates/paste-1.0.15.crate) = 18374
+SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
+SIZE (rust/crates/phf-0.11.3.crate) = 23231
+SHA256 (rust/crates/phf-0.12.1.crate) = 913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7
+SIZE (rust/crates/phf-0.12.1.crate) = 23768
+SHA256 (rust/crates/phf_codegen-0.11.3.crate) = aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a
+SIZE (rust/crates/phf_codegen-0.11.3.crate) = 13741
+SHA256 (rust/crates/phf_codegen-0.12.1.crate) = efbdcb6f01d193b17f0b9c3360fa7e0e620991b193ff08702f78b3ce365d7e61
+SIZE (rust/crates/phf_codegen-0.12.1.crate) = 14215
+SHA256 (rust/crates/phf_generator-0.11.3.crate) = 3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d
+SIZE (rust/crates/phf_generator-0.11.3.crate) = 15431
+SHA256 (rust/crates/phf_generator-0.12.1.crate) = 2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b
+SIZE (rust/crates/phf_generator-0.12.1.crate) = 15743
+SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
+SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
+SHA256 (rust/crates/phf_shared-0.12.1.crate) = 06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981
+SIZE (rust/crates/phf_shared-0.12.1.crate) = 15568
+SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
+SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
+SHA256 (rust/crates/portable-atomic-1.11.1.crate) = f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483
+SIZE (rust/crates/portable-atomic-1.11.1.crate) = 185506
+SHA256 (rust/crates/proc-macro2-1.0.101.crate) = 89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de
+SIZE (rust/crates/proc-macro2-1.0.101.crate) = 53886
+SHA256 (rust/crates/quote-1.0.41.crate) = ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1
+SIZE (rust/crates/quote-1.0.41.crate) = 31408
+SHA256 (rust/crates/r-efi-5.3.0.crate) = 69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f
+SIZE (rust/crates/r-efi-5.3.0.crate) = 64532
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/redox_syscall-0.5.7.crate) = 9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f
-SIZE (rust/crates/redox_syscall-0.5.7.crate) = 26249
+SHA256 (rust/crates/redox_syscall-0.5.18.crate) = ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d
+SIZE (rust/crates/redox_syscall-0.5.18.crate) = 30747
+SHA256 (rust/crates/redox_users-0.5.2.crate) = a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac
+SIZE (rust/crates/redox_users-0.5.2.crate) = 17280
+SHA256 (rust/crates/regex-automata-0.4.13.crate) = 5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c
+SIZE (rust/crates/regex-automata-0.4.13.crate) = 625250
+SHA256 (rust/crates/regex-syntax-0.8.8.crate) = 7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58
+SIZE (rust/crates/regex-syntax-0.8.8.crate) = 359141
 SHA256 (rust/crates/rsconf-0.2.2.crate) = bd2af859f1af0401e7fc7577739c87b0d239d8a5da400d717183bca92336bcdc
 SIZE (rust/crates/rsconf-0.2.2.crate) = 16338
-SHA256 (rust/crates/rust-embed-8.5.0.crate) = fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0
-SIZE (rust/crates/rust-embed-8.5.0.crate) = 904054
-SHA256 (rust/crates/rust-embed-impl-8.5.0.crate) = 6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478
-SIZE (rust/crates/rust-embed-impl-8.5.0.crate) = 6004
-SHA256 (rust/crates/rust-embed-utils-8.5.0.crate) = 2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d
-SIZE (rust/crates/rust-embed-utils-8.5.0.crate) = 3445
+SHA256 (rust/crates/rust-embed-8.8.0.crate) = fb44e1917075637ee8c7bcb865cf8830e3a92b5b1189e44e3a0ab5a0d5be314b
+SIZE (rust/crates/rust-embed-8.8.0.crate) = 900773
+SHA256 (rust/crates/rust-embed-impl-8.8.0.crate) = 382499b49db77a7c19abd2a574f85ada7e9dbe125d5d1160fa5cad7c4cf71fc9
+SIZE (rust/crates/rust-embed-impl-8.8.0.crate) = 9281
+SHA256 (rust/crates/rust-embed-utils-8.8.0.crate) = 21fcbee55c2458836bcdbfffb6ec9ba74bbc23ca7aa6816015a3dd2c4d8fc185
+SIZE (rust/crates/rust-embed-utils-8.8.0.crate) = 5735
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/scc-2.4.0.crate) = 46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc
+SIZE (rust/crates/scc-2.4.0.crate) = 145014
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/serial_test-1.0.0.crate) = 538c30747ae860d6fb88330addbbd3e0ddbe46d662d032855596d8a8ca260611
-SIZE (rust/crates/serial_test-1.0.0.crate) = 7912
-SHA256 (rust/crates/serial_test_derive-1.0.0.crate) = 079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69
-SIZE (rust/crates/serial_test_derive-1.0.0.crate) = 5715
-SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
-SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sdd-3.0.10.crate) = 490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca
+SIZE (rust/crates/sdd-3.0.10.crate) = 32748
+SHA256 (rust/crates/serde-1.0.228.crate) = 9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e
+SIZE (rust/crates/serde-1.0.228.crate) = 83652
+SHA256 (rust/crates/serde_core-1.0.228.crate) = 41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad
+SIZE (rust/crates/serde_core-1.0.228.crate) = 63111
+SHA256 (rust/crates/serde_derive-1.0.228.crate) = d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79
+SIZE (rust/crates/serde_derive-1.0.228.crate) = 59605
+SHA256 (rust/crates/serial_test-3.2.0.crate) = 1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9
+SIZE (rust/crates/serial_test-3.2.0.crate) = 9232
+SHA256 (rust/crates/serial_test_derive-3.2.0.crate) = 5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef
+SIZE (rust/crates/serial_test_derive-3.2.0.crate) = 6992
+SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
+SIZE (rust/crates/sha2-0.10.9.crate) = 29271
+SHA256 (rust/crates/shellexpand-3.1.1.crate) = 8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb
+SIZE (rust/crates/shellexpand-3.1.1.crate) = 25904
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
-SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
-SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
-SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
-SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
-SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
-SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.79.crate) = 89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590
-SIZE (rust/crates/syn-2.0.79.crate) = 268981
+SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
+SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
+SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03
+SIZE (rust/crates/smallvec-1.15.1.crate) = 38116
+SHA256 (rust/crates/syn-2.0.107.crate) = 2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b
+SIZE (rust/crates/syn-2.0.107.crate) = 301716
 SHA256 (rust/crates/terminfo-0.9.0.crate) = d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662
 SIZE (rust/crates/terminfo-0.9.0.crate) = 45420
-SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
-SIZE (rust/crates/typenum-1.17.0.crate) = 42849
-SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
-SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279
+SHA256 (rust/crates/thiserror-2.0.17.crate) = f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8
+SIZE (rust/crates/thiserror-2.0.17.crate) = 28857
+SHA256 (rust/crates/thiserror-impl-2.0.17.crate) = 3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913
+SIZE (rust/crates/thiserror-impl-2.0.17.crate) = 21344
+SHA256 (rust/crates/typenum-1.19.0.crate) = 562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb
+SIZE (rust/crates/typenum-1.19.0.crate) = 76414
+SHA256 (rust/crates/unicode-ident-1.0.20.crate) = 462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06
+SIZE (rust/crates/unicode-ident-1.0.20.crate) = 47416
 SHA256 (rust/crates/unicode-segmentation-1.12.0.crate) = f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493
 SIZE (rust/crates/unicode-segmentation-1.12.0.crate) = 106323
-SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd
-SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
+SHA256 (rust/crates/unicode-width-0.2.2.crate) = b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254
+SIZE (rust/crates/unicode-width-0.2.2.crate) = 282768
+SHA256 (rust/crates/unix_path-1.0.1.crate) = af8e291873ae77c4c8d9c9b34d0bee68a35b048fb39c263a5155e0e353783eaf
+SIZE (rust/crates/unix_path-1.0.1.crate) = 22226
+SHA256 (rust/crates/unix_str-1.0.0.crate) = 2ace0b4755d0a2959962769239d56267f8a024fef2d9b32666b3dcd0946b0906
+SIZE (rust/crates/unix_str-1.0.0.crate) = 16226
 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
-SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
-SIZE (rust/crates/widestring-1.1.0.crate) = 85046
-SHA256 (rust/crates/winapi-util-0.1.9.crate) = cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb
-SIZE (rust/crates/winapi-util-0.1.9.crate) = 12464
-SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
-SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
-SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
-SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
-SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
-SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
-SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
-SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
-SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
-SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
-SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
-SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
-SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
-SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
-SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b
+SIZE (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = 28477
+SHA256 (rust/crates/wasip2-1.0.1+wasi-0.2.4.crate) = 0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7
+SIZE (rust/crates/wasip2-1.0.1+wasi-0.2.4.crate) = 132087
+SHA256 (rust/crates/widestring-1.2.1.crate) = 72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471
+SIZE (rust/crates/widestring-1.2.1.crate) = 90350
+SHA256 (rust/crates/winapi-util-0.1.11.crate) = c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22
+SIZE (rust/crates/winapi-util-0.1.11.crate) = 13368
+SHA256 (rust/crates/windows-link-0.2.1.crate) = f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5
+SIZE (rust/crates/windows-link-0.2.1.crate) = 6133
+SHA256 (rust/crates/windows-sys-0.61.2.crate) = ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc
+SIZE (rust/crates/windows-sys-0.61.2.crate) = 2517186
+SHA256 (rust/crates/wit-bindgen-0.46.0.crate) = f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59
+SIZE (rust/crates/wit-bindgen-0.46.0.crate) = 60508
 SHA256 (fish-shell-rust-pcre2-0.2.9-utf32_GH0.tar.gz) = e5af06d7b737b66f7476a223e8a6cd1e2b1ca834b38b3de58901d4dbcf0a054d
 SIZE (fish-shell-rust-pcre2-0.2.9-utf32_GH0.tar.gz) = 742431
diff --git a/shells/fish/files/patch-src_path.rs b/shells/fish/files/patch-src_path.rs
deleted file mode 100644
index 01335107ef4e..000000000000
--- a/shells/fish/files/patch-src_path.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/path.rs.orig	2025-09-15 19:16:57 UTC
-+++ src/path.rs
-@@ -710,7 +710,7 @@ fn path_remoteness(path: &wstr) -> DirRemoteness {
-     #[cfg(not(target_os = "linux"))]
-     {
-         fn remoteness_via_statfs<StatFS, Flags>(
--            statfn: unsafe extern "C" fn(*const i8, *mut StatFS) -> libc::c_int,
-+            statfn: unsafe extern "C" fn(*const libc::c_char, *mut StatFS) -> libc::c_int,
-             flagsfn: fn(&StatFS) -> Flags,
-             is_local_flag: u64,
-             path: &std::ffi::CStr,
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index db757e21729c..8a104ee027c7 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -1,17 +1,17 @@
 @shell bin/fish
 bin/fish_indent
 bin/fish_key_reader
-share/applications/fish.desktop
-share/pixmaps/fish.png
 @sample %%ETCDIR%%/config.fish.sample
 libdata/pkgconfig/fish.pc
 %%DATADIR%%/__fish_build_paths.fish
+%%DATADIR%%/completions/!.fish
 %%DATADIR%%/completions/..fish
 %%DATADIR%%/completions/7z.fish
 %%DATADIR%%/completions/7za.fish
 %%DATADIR%%/completions/7zr.fish
 %%DATADIR%%/completions/VBoxHeadless.fish
 %%DATADIR%%/completions/VBoxSDL.fish
+%%DATADIR%%/completions/[.fish
 %%DATADIR%%/completions/a2disconf.fish
 %%DATADIR%%/completions/a2dismod.fish
 %%DATADIR%%/completions/a2dissite.fish
@@ -78,6 +78,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/arc.fish
 %%DATADIR%%/completions/archlinux-java.fish
 %%DATADIR%%/completions/arepack.fish
+%%DATADIR%%/completions/argocd.fish
 %%DATADIR%%/completions/argparse.fish
 %%DATADIR%%/completions/ark.fish
 %%DATADIR%%/completions/arp.fish
@@ -161,6 +162,8 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/chown.fish
 %%DATADIR%%/completions/chronyc.fish
 %%DATADIR%%/completions/chsh.fish
+%%DATADIR%%/completions/cilium.fish
+%%DATADIR%%/completions/cjpm.fish
 %%DATADIR%%/completions/cjxl.fish
 %%DATADIR%%/completions/clang++.fish
 %%DATADIR%%/completions/clang.fish
@@ -193,6 +196,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/configure.fish
 %%DATADIR%%/completions/conjure.fish
 %%DATADIR%%/completions/connmanctl.fish
+%%DATADIR%%/completions/container.fish
 %%DATADIR%%/completions/contains.fish
 %%DATADIR%%/completions/continue.fish
 %%DATADIR%%/completions/convert.fish
@@ -200,6 +204,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cowsay.fish
 %%DATADIR%%/completions/cowthink.fish
 %%DATADIR%%/completions/cp.fish
+%%DATADIR%%/completions/cpan.fish
 %%DATADIR%%/completions/cpupower.fish
 %%DATADIR%%/completions/crc.fish
 %%DATADIR%%/completions/create_ap.fish
@@ -210,6 +215,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/csharp.fish
 %%DATADIR%%/completions/csi.fish
 %%DATADIR%%/completions/csvlens.fish
+%%DATADIR%%/completions/cue.fish
 %%DATADIR%%/completions/cupsaccept.fish
 %%DATADIR%%/completions/cupsdisable.fish
 %%DATADIR%%/completions/cupsenable.fish
@@ -221,6 +227,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cygpath.fish
 %%DATADIR%%/completions/cygport.fish
 %%DATADIR%%/completions/cygstart.fish
+%%DATADIR%%/completions/dagger.fish
 %%DATADIR%%/completions/darcs.fish
 %%DATADIR%%/completions/dart.fish
 %%DATADIR%%/completions/date.fish
@@ -239,6 +246,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/diskutil.fish
 %%DATADIR%%/completions/disown.fish
 %%DATADIR%%/completions/display.fish
+%%DATADIR%%/completions/distrobox.fish
 %%DATADIR%%/completions/dive.fish
 %%DATADIR%%/completions/djview.fish
 %%DATADIR%%/completions/djview4.fish
@@ -362,6 +370,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/git-subtree.fish
 %%DATADIR%%/completions/git.fish
 %%DATADIR%%/completions/gitk.fish
+%%DATADIR%%/completions/glow.fish
 %%DATADIR%%/completions/gnome-extensions.fish
 %%DATADIR%%/completions/go.fish
 %%DATADIR%%/completions/godoc.fish
@@ -411,12 +420,14 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/horcrux.fish
 %%DATADIR%%/completions/hostnamectl.fish
 %%DATADIR%%/completions/htop.fish
+%%DATADIR%%/completions/hubble.fish
 %%DATADIR%%/completions/hugo.fish
 %%DATADIR%%/completions/hwinfo.fish
 %%DATADIR%%/completions/i3-msg.fish
 %%DATADIR%%/completions/ibmcloud.fish
 %%DATADIR%%/completions/ibus.fish
 %%DATADIR%%/completions/icdiff.fish
+%%DATADIR%%/completions/iconutil.fish
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
 %%DATADIR%%/completions/identify.fish
@@ -455,6 +466,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/just.fish
 %%DATADIR%%/completions/jv.fish
 %%DATADIR%%/completions/k3d.fish
+%%DATADIR%%/completions/k9s.fish
 %%DATADIR%%/completions/kak.fish
 %%DATADIR%%/completions/kb.fish
 %%DATADIR%%/completions/kcmshell5.fish
@@ -472,6 +484,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/kops.fish
 %%DATADIR%%/completions/krita.fish
 %%DATADIR%%/completions/ksh.fish
+%%DATADIR%%/completions/kubebuilder.fish
 %%DATADIR%%/completions/kubectl.fish
 %%DATADIR%%/completions/kustomize.fish
 %%DATADIR%%/completions/latex.fish
@@ -680,6 +693,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/pkgrm.fish
 %%DATADIR%%/completions/pkill.fish
 %%DATADIR%%/completions/plutil.fish
+%%DATADIR%%/completions/pnpm.fish
 %%DATADIR%%/completions/poff.fish
 %%DATADIR%%/completions/pon.fish
 %%DATADIR%%/completions/port.fish
@@ -691,6 +705,8 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/pre-commit.fish
 %%DATADIR%%/completions/prevd.fish
 %%DATADIR%%/completions/prime-run.fish
+%%DATADIR%%/completions/protontricks-launch.fish
+%%DATADIR%%/completions/protontricks.fish
 %%DATADIR%%/completions/proxychains.fish
 %%DATADIR%%/completions/prt-get.fish
 %%DATADIR%%/completions/ps.fish
@@ -703,6 +719,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/pstack.fish
 %%DATADIR%%/completions/pstree.fish
 %%DATADIR%%/completions/psub.fish
+%%DATADIR%%/completions/pulumi.fish
 %%DATADIR%%/completions/pushd.fish
 %%DATADIR%%/completions/pv.fish
 %%DATADIR%%/completions/pwd.fish
@@ -822,6 +839,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/ssh.fish
 %%DATADIR%%/completions/sshfs.fish
 %%DATADIR%%/completions/stack.fish
+%%DATADIR%%/completions/stackit.fish
 %%DATADIR%%/completions/starship.fish
 %%DATADIR%%/completions/stat.fish
 %%DATADIR%%/completions/status.fish
@@ -831,6 +849,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/string.fish
 %%DATADIR%%/completions/su.fish
 %%DATADIR%%/completions/subl.fish
+%%DATADIR%%/completions/sudo-rs.fish
 %%DATADIR%%/completions/sudo.fish
 %%DATADIR%%/completions/sv.fish
 %%DATADIR%%/completions/svn.fish
@@ -842,6 +861,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/systemd-analyze.fish
 %%DATADIR%%/completions/systemd-cryptenroll.fish
 %%DATADIR%%/completions/systemd-nspawn.fish
+%%DATADIR%%/completions/t-rec.fish
 %%DATADIR%%/completions/tail.fish
 %%DATADIR%%/completions/tailscale.fish
 %%DATADIR%%/completions/tar.fish
@@ -862,6 +882,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/tmutil.fish
 %%DATADIR%%/completions/tmux.fish
 %%DATADIR%%/completions/tmuxinator.fish
+%%DATADIR%%/completions/tmuxp.fish
 %%DATADIR%%/completions/tofu.fish
 %%DATADIR%%/completions/tokei.fish
 %%DATADIR%%/completions/toot.fish
@@ -889,6 +910,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/type.fish
 %%DATADIR%%/completions/typst.fish
 %%DATADIR%%/completions/udevadm.fish
+%%DATADIR%%/completions/udevil.fish
 %%DATADIR%%/completions/udisksctl.fish
 %%DATADIR%%/completions/ulimit.fish
 %%DATADIR%%/completions/umask.fish
@@ -908,6 +930,8 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/userdbctl.fish
 %%DATADIR%%/completions/userdel.fish
 %%DATADIR%%/completions/usermod.fish
+%%DATADIR%%/completions/uv.fish
+%%DATADIR%%/completions/uvx.fish
 %%DATADIR%%/completions/vagrant.fish
 %%DATADIR%%/completions/valgrind.fish
 %%DATADIR%%/completions/validate-spice.fish
@@ -920,6 +944,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/vips.fish
 %%DATADIR%%/completions/virsh.fish
 %%DATADIR%%/completions/vmctl.fish
+%%DATADIR%%/completions/volta.fish
 %%DATADIR%%/completions/w.fish
 %%DATADIR%%/completions/wait.fish
 %%DATADIR%%/completions/wajig.fish
@@ -1037,8 +1062,11 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_append.fish
 %%DATADIR%%/functions/__fish_apropos.fish
 %%DATADIR%%/functions/__fish_argcomplete_complete.fish
+%%DATADIR%%/functions/__fish_cache_put.fish
 %%DATADIR%%/functions/__fish_cache_sourced_completions.fish
+%%DATADIR%%/functions/__fish_cached.fish
 %%DATADIR%%/functions/__fish_cancel_commandline.fish
+%%DATADIR%%/functions/__fish_canonicalize_builtin.fish
 %%DATADIR%%/functions/__fish_change_key_bindings.fish
 %%DATADIR%%/functions/__fish_cmd__complete_args.fish
 %%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
@@ -1092,6 +1120,9 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_crux_packages.fish
 %%DATADIR%%/functions/__fish_cursor_konsole.fish
 %%DATADIR%%/functions/__fish_cursor_xterm.fish
+%%DATADIR%%/functions/__fish_data_list_files.fish
+%%DATADIR%%/functions/__fish_data_with_directory.fish
+%%DATADIR%%/functions/__fish_data_with_file.fish
 %%DATADIR%%/functions/__fish_describe_command.fish
 %%DATADIR%%/functions/__fish_echo.fish
 %%DATADIR%%/functions/__fish_edit_command_if_at_cursor.fish
@@ -1104,14 +1135,18 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_is_first_token.fish
 %%DATADIR%%/functions/__fish_is_git_repository.fish
 %%DATADIR%%/functions/__fish_is_nth_token.fish
+%%DATADIR%%/functions/__fish_is_standalone.fish
 %%DATADIR%%/functions/__fish_is_switch.fish
 %%DATADIR%%/functions/__fish_is_token_n.fish
 %%DATADIR%%/functions/__fish_is_zfs_feature_enabled.fish
 %%DATADIR%%/functions/__fish_list_current_token.fish
+%%DATADIR%%/functions/__fish_locale_vars.fish
+%%DATADIR%%/functions/__fish_macos_set_env.fish
 %%DATADIR%%/functions/__fish_make_cache_dir.fish
 %%DATADIR%%/functions/__fish_make_completion_signals.fish
 %%DATADIR%%/functions/__fish_man_page.fish
 %%DATADIR%%/functions/__fish_md5.fish
+%%DATADIR%%/functions/__fish_mktemp_relative.fish
 %%DATADIR%%/functions/__fish_move_last.fish
 %%DATADIR%%/functions/__fish_no_arguments.fish
 %%DATADIR%%/functions/__fish_not_contain_opt.fish
@@ -1168,6 +1203,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_print_xdg_mimetypes.fish
 %%DATADIR%%/functions/__fish_print_xwindows.fish
 %%DATADIR%%/functions/__fish_print_zfs_snapshots.fish
+%%DATADIR%%/functions/__fish_protontricks_complete_appid.fish
 %%DATADIR%%/functions/__fish_ps.fish
 %%DATADIR%%/functions/__fish_pwd.fish
 %%DATADIR%%/functions/__fish_reg__complete_keys.fish
@@ -1183,10 +1219,12 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_systemd_machines.fish
 %%DATADIR%%/functions/__fish_toggle_comment_commandline.fish
 %%DATADIR%%/functions/__fish_tokenizer_state.fish
+%%DATADIR%%/functions/__fish_uname.fish
 %%DATADIR%%/functions/__fish_use_subcommand.fish
 %%DATADIR%%/functions/__fish_vcs_prompt.fish
 %%DATADIR%%/functions/__fish_whatis.fish
 %%DATADIR%%/functions/__fish_whatis_current_token.fish
+%%DATADIR%%/functions/__fish_with_status.fish
 %%DATADIR%%/functions/__ssh_history_completions.fish
 %%DATADIR%%/functions/__terlar_git_prompt.fish
 %%DATADIR%%/functions/_validate_int.fish
@@ -1218,6 +1256,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/fish_hg_prompt.fish
 %%DATADIR%%/functions/fish_hybrid_key_bindings.fish
 %%DATADIR%%/functions/fish_is_root_user.fish
+%%DATADIR%%/functions/fish_jj_prompt.fish
 %%DATADIR%%/functions/fish_job_summary.fish
 %%DATADIR%%/functions/fish_mode_prompt.fish
 %%DATADIR%%/functions/fish_opt.fish
@@ -1262,7 +1301,6 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/vared.fish
 %%DATADIR%%/groff/fish.tmac
 %%DATADIR%%/tools/create_manpage_completions.py
-%%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/web_config/favicon.png
 %%DATADIR%%/tools/web_config/fishconfig.css
 %%DATADIR%%/tools/web_config/fishconfig_print.css
@@ -1343,7 +1381,7 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%%%DATADIR%%/man/man1/export.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/false.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fg.1.gz
-%%MANPAGES%%%%DATADIR%%/man/man1/fish_vi_key_bindings.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish-%%CMAKE_BUILD_TYPE%%notes.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-completions.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-doc.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-faq.1.gz
@@ -1351,7 +1389,7 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-interactive.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-language.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-prompt-tutorial.1.gz
-%%MANPAGES%%%%DATADIR%%/man/man1/fish-%%CMAKE_BUILD_TYPE%%notes.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish-terminal-compatibility.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-tutorial.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_add_path.1.gz
@@ -1375,9 +1413,11 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_should_add_to_history.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_status_to_signal.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_svn_prompt.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish_tab_title.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_title.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_update_completions.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_vcs_prompt.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish_vi_key_bindings.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/for.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/funced.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/funcsave.1.gz
@@ -1447,17 +1487,11 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%share/man/man1/fish-interactive.1.gz
 %%MANPAGES%%share/man/man1/fish-language.1.gz
 %%MANPAGES%%share/man/man1/fish-prompt-tutorial.1.gz
+%%MANPAGES%%share/man/man1/fish-terminal-compatibility.1.gz
 %%MANPAGES%%share/man/man1/fish-tutorial.1.gz
 %%MANPAGES%%share/man/man1/fish.1.gz
 %%MANPAGES%%share/man/man1/fish_indent.1.gz
 %%MANPAGES%%share/man/man1/fish_key_reader.1.gz
-%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/fish.mo
 @dir %%ETCDIR%%/completions
 @dir %%ETCDIR%%/conf.d
 @dir %%ETCDIR%%/functions