Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sad for openSUSE:Factory checked in at 2026-11-20 14:49:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sad (Old) and /work/SRC/openSUSE:Factory/.sad.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sad" Fri Nov 20 14:49:47 2026 rev:9 rq:1398936 version:0.4.33 Changes: -------- --- /work/SRC/openSUSE:Factory/sad/sad.changes 2025-04-14 16:50:38.861235055 +0200 +++ /work/SRC/openSUSE:Factory/.sad.new.1251/sad.changes 2026-11-20 14:52:55.632126289 +0100 @@ -1,0 +2,11 @@ +Wed Nov 18 15:55:09 UTC 2026 - Andrea Manzini <[email protected]> + +- Update to version 0.4.33: + * Match filenames in fzf without matching trailing hunk metadata. + * Dim the hunk metadata in fzf. + * Restore default Ctrl-C handling so blocking work terminates + immediately. + * Exit immediately with status 130 when fzf aborts, including + while stdin remains open. + +------------------------------------------------------------------- Old: ---- sad-0.4.32.tar.gz New: ---- sad-0.4.33.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sad.spec ++++++ --- /var/tmp/diff_new_pack.a6fDX9/_old 2026-11-20 14:52:56.829176949 +0100 +++ /var/tmp/diff_new_pack.a6fDX9/_new 2026-11-20 14:52:56.831177034 +0100 @@ -1,7 +1,7 @@ # # spec file for package sad # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: sad -Version: 0.4.32 +Version: 0.4.33 Release: 0 Summary: CLI search and replace batch file editing tool -URL: https://github.com/ms-jpq/sad License: (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND MIT AND (Artistic-2.0 OR CC0-1.0) AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND (MIT OR Unlicense) AND MPL-2.0 AND MPL-2.0+ AND Zlib AND zlib-acknowledgement AND Apache-2.0 +URL: https://github.com/ms-jpq/sad Source0: https://github.com/ms-jpq/sad/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.zst +# Source-Binary-Exception: vendor.tar.zst:vendor/winapi-*-pc-windows-gnu-*/lib/* -- other-platform: Windows import libraries BuildRequires: cargo-packaging BuildRequires: python3 BuildRequires: zstd ++++++ sad-0.4.32.tar.gz -> sad-0.4.33.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/.github/workflows/ci.yml new/sad-0.4.33/.github/workflows/ci.yml --- old/sad-0.4.32/.github/workflows/ci.yml 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/.github/workflows/ci.yml 2026-11-02 08:13:05.000000000 +0100 @@ -25,6 +25,9 @@ override: true - run: |- + rustup component add clippy + + - run: |- make lint build: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/.github/workflows/release.yml new/sad-0.4.33/.github/workflows/release.yml --- old/sad-0.4.32/.github/workflows/release.yml 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/.github/workflows/release.yml 2026-11-02 08:13:05.000000000 +0100 @@ -24,6 +24,9 @@ override: true - run: |- + rustup component add clippy + + - run: |- make lint build: @@ -112,4 +115,6 @@ GH_TOKEN: ${{ github.token }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: |- + make spec + cp artifacts/sad.spec arts/sad.spec make ci diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/Cargo.lock new/sad-0.4.33/Cargo.lock --- old/sad-0.4.32/Cargo.lock 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/Cargo.lock 2026-11-02 08:13:05.000000000 +0100 @@ -1,27 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] @@ -37,9 +22,9 @@ [[package]] name = "anstream" -version = "0.6.14" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -52,88 +37,68 @@ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "once_cell_polyfill", + "windows-sys", ] [[package]] name = "bitflags" -version = "2.6.0" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] -name = "bytes" -version = "1.6.1" +name = "bumpalo" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] -name = "cc" -version = "1.1.2" +name = "bytes" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47de7e88bbbd467951ae7f5a6f34f70d1b4d9cfce53d5fd70f74ebe118b3db56" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "clap" -version = "4.5.27" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" dependencies = [ "clap_builder", "clap_derive", @@ -141,9 +106,9 @@ [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d" dependencies = [ "anstream", "anstyle", @@ -154,9 +119,9 @@ [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ "heck", "proc-macro2", @@ -166,15 +131,15 @@ [[package]] name = "clap_lex" -version = "0.7.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "difflib" @@ -183,32 +148,20 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "env_home" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" - -[[package]] name = "errno" -version = "0.3.9" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "futures" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -221,9 +174,9 @@ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -231,15 +184,15 @@ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -248,15 +201,15 @@ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", @@ -265,21 +218,21 @@ [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -289,128 +242,113 @@ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] [[package]] name = "getrandom" -version = "0.2.15" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", ] [[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "is_terminal_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] -name = "is_terminal_polyfill" -version = "1.70.0" +name = "js-sys" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" +dependencies = [ + "cfg-if", + "futures-util", + "wasm-bindgen", +] [[package]] name = "libc" -version = "0.2.169" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "mio" -version = "1.0.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ - "hermit-abi", "libc", "wasi", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] -name = "object" -version = "0.36.1" +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] [[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + +[[package]] name = "regex" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -420,9 +358,9 @@ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -431,32 +369,32 @@ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rustix" -version = "0.38.34" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] +name = "rustversion" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" + +[[package]] name = "sad" -version = "0.4.32" +version = "0.4.33" dependencies = [ "aho-corasick", "ansi_term", @@ -472,36 +410,34 @@ [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] [[package]] name = "slab" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "socket2" -version = "0.5.7" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -512,9 +448,9 @@ [[package]] name = "syn" -version = "2.0.71" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" dependencies = [ "proc-macro2", "quote", @@ -523,35 +459,34 @@ [[package]] name = "terminal_size" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" +checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] name = "tokio" -version = "1.43.0" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "signal-hook-registry", "socket2", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" [[package]] name = "utf8parse" @@ -561,137 +496,107 @@ [[package]] name = "uuid" -version = "1.12.1" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" +checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" dependencies = [ "getrandom", + "js-sys", + "wasm-bindgen", ] [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "which" -version = "7.0.1" +name = "wasm-bindgen" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ - "either", - "env_home", - "rustix", - "winsafe", + "cfg-if", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "wasm-bindgen-macro" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "quote", + "wasm-bindgen-macro-support", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "wasm-bindgen-macro-support" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ - "windows-targets", + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", ] [[package]] -name = "windows-sys" -version = "0.59.0" +name = "wasm-bindgen-shared" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ - "windows-targets", + "unicode-ident", ] [[package]] -name = "windows-targets" -version = "0.52.6" +name = "which" +version = "8.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "bae2f2b2b816647a1cab1acc91f5bd20812d53cb344382635ec2181940c8034f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "libc", ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] [[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" +name = "windows-link" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "winsafe" -version = "0.0.19" +name = "windows-sys" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/Cargo.toml new/sad-0.4.33/Cargo.toml --- old/sad-0.4.32/Cargo.toml 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/Cargo.toml 2026-11-02 08:13:05.000000000 +0100 @@ -3,7 +3,7 @@ description = "Space Age seD | https://github.com/ms-jpq/sad" edition = "2021" name = "sad" -version = "0.4.32" +version = "0.4.33" [dependencies] @@ -21,7 +21,6 @@ "net", "process", "rt-multi-thread", - "signal", ] } uuid = { version = "*", features = ["v4"] } which = { version = "*" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/Makefile new/sad-0.4.33/Makefile --- old/sad-0.4.32/Makefile 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/Makefile 2026-11-02 08:13:05.000000000 +0100 @@ -8,7 +8,7 @@ .DEFAULT_GOAL := dev -.PHONY: clean clobber lint mypy clippy deps build release ci test +.PHONY: clean clobber lint mypy clippy deps build release ci test spec OS ?= @@ -20,7 +20,7 @@ clean: shopt -u failglob - rm -v -rf -- artifacts/*.{zip,deb} .mypy_cache/ target/ temp/ + rm -v -rf -- artifacts/*.{zip,deb,spec} .mypy_cache/ target/ temp/ clobber: clean rm -v -rf -- .venv/ @@ -54,5 +54,8 @@ ci: .venv/$(VENV)/mypy .venv/$(VENV)/python ./ci/release.py +spec: .venv/$(VENV)/mypy + .venv/$(VENV)/python ./build.py spec + test: cargo test --locked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/RELEASE_NOTES.md new/sad-0.4.33/RELEASE_NOTES.md --- old/sad-0.4.32/RELEASE_NOTES.md 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/RELEASE_NOTES.md 2026-11-02 08:13:05.000000000 +0100 @@ -1,12 +1,24 @@ ## Good news +v0.4.33 + +- Match filenames in fzf without matching trailing hunk metadata. + +- Dim the hunk metadata in fzf. + +- Restore default Ctrl-C handling so blocking work terminates immediately. + +- Exit immediately with status 130 when fzf aborts, including while stdin remains open. + +--- + v0.4.32 - It looks like in the newer versions of `fzf` the command that was used to "execute and exit" no longer works. - A quick fix is to simply migrate to `fzf`'s new `become` command, which almost does the same thing. - - This is a breaking change for holder versions of `fzf` however, and users using `fzf` shipped with ubuntu 22 and below should stick with old version for now + - This is a breaking change for older versions of `fzf` however, and users using `fzf` shipped with ubuntu 22 and below should stick with old version for now v0.4.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/build.py new/sad-0.4.33/build.py --- old/sad-0.4.32/build.py 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/build.py 2026-11-02 08:13:05.000000000 +0100 @@ -131,6 +131,18 @@ _deb(triple) +def _spec() -> None: + j2 = Environment( + undefined=StrictUndefined, + keep_trailing_newline=True, + loader=FileSystemLoader(_TOP_LEVEL / "ci" / "templates"), + ) + package = loads((_TOP_LEVEL / "Cargo.toml").read_text())["package"] + rendered = j2.get_template("sad.spec").render(package) + _ARTS.mkdir(parents=True, exist_ok=True) + (_ARTS / "sad.spec").write_text(rendered) + + def _parse_args() -> Namespace: arch_choices = {"x86_64", "aarch64"} sys_choices = {vendor_sys for (vendor_sys, _) in _DEFAULTS.values()} @@ -140,6 +152,8 @@ parser = ArgumentParser() sub_parser = parser.add_subparsers(dest="action", required=True) + sub_parser.add_parser("spec") + with nullcontext(sub_parser.add_parser("deps")) as p: pass @@ -179,6 +193,9 @@ if args.action == "deps": _deps() + elif args.action == "spec": + _spec() + elif args.action == "build": triple = "-".join((args.arch, args.os, args.compiler)) _build(triple) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/ci/templates/sad.spec new/sad-0.4.33/ci/templates/sad.spec --- old/sad-0.4.32/ci/templates/sad.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/sad-0.4.33/ci/templates/sad.spec 2026-11-02 08:13:05.000000000 +0100 @@ -0,0 +1,60 @@ +Name: sad +Version: {{ version }} +Release: 1%{?dist} +Summary: Space Age seD +URL: https://github.com/ms-jpq/sad +License: MIT +Source0: https://github.com/ms-jpq/sad/archive/refs/tags/v%{version}.tar.gz + +# BuildRequires: List all packages required to build the software +BuildRequires: git +BuildRequires: python3 +BuildRequires: curl +BuildRequires: gcc + +%define debug_package %{nil} + +# Optional dependencies +# For TUI usage +#Requires: fzf +# For diff colourizer +#Requires: diff-so-fancy +#Requires: git-delta + +%description +Space Age seD + +%prep +%setup -q +%ifarch aarch64 +sed -i '/target.aarch64-unknown-linux-gnu/,+1d' .cargo/config.toml +%endif + +%build +# Install Rust using curl +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +export PATH="$PATH:$HOME/.cargo/bin" +$HOME/.cargo/bin/cargo build --release --all-features + +%install +# You may need to adjust paths and permissions as necessary +install -D -m 755 target/release/%{name} %{buildroot}/usr/bin/%{name} +install -D -m 644 LICENSE %{buildroot}/usr/share/licenses/%{name}/LICENSE +install -D -m 644 README.md %{buildroot}/usr/share/doc/%{name}/README.md + +%check +$HOME/.cargo/bin/cargo test --release --locked --all-features + +%files +# List all installed files and directories +%license LICENSE +%doc README.md +/usr/bin/%{name} + +%changelog +* Sun December 8 2024 - Danie de Jager - 0.4.31-3 +* Wed October 2 2024 - Danie de Jager - 0.4.31-2 +* Sat June 29 2024 - Danie de Jager - 0.4.31-1 +* Sun May 26 2024 - Danie de Jager - 0.4.29-1 +* Mon May 13 2024 - Danie de Jager - 0.4.28-1 +- Initial version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/sad.spec new/sad-0.4.33/sad.spec --- old/sad-0.4.32/sad.spec 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/sad.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -Name: sad -Version: 0.4.31 -Release: 3%{?dist} -Summary: Space Age seD -URL: https://github.com/ms-jpq/sad -License: MIT -Source0: https://github.com/ms-jpq/sad/archive/refs/tags/v%{version}.tar.gz - -# BuildRequires: List all packages required to build the software -BuildRequires: git -BuildRequires: python3 -BuildRequires: curl -BuildRequires: gcc - -%define debug_package %{nil} - -# Optional dependencies -# For TUI usage -#Requires: fzf -# For diff colourizer -#Requires: diff-so-fancy -#Requires: git-delta - -%description -Space Age seD - -%prep -%setup -q -%ifarch aarch64 -sed -i '/target.aarch64-unknown-linux-gnu/,+1d' .cargo/config.toml -%endif - -%build -# Install Rust using curl -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -export PATH="$PATH:$HOME/.cargo/bin" -$HOME/.cargo/bin/cargo build --release --all-features - -%install -# You may need to adjust paths and permissions as necessary -install -D -m 755 target/release/%{name} %{buildroot}/usr/bin/%{name} -install -D -m 644 LICENSE %{buildroot}/usr/share/licenses/%{name}/LICENSE -install -D -m 644 README.md %{buildroot}/usr/share/doc/%{name}/README.md - -%check -$HOME/.cargo/bin/cargo test --release --locked --all-features - -%files -# List all installed files and directories -%license LICENSE -%doc README.md -/usr/bin/%{name} - -%changelog -* Sun December 8 2024 - Danie de Jager - 0.4.31-3 -* Wed October 2 2024 - Danie de Jager - 0.4.31-2 -* Sat June 29 2024 - Danie de Jager - 0.4.31-1 -* Sun May 26 2024 - Danie de Jager - 0.4.29-1 -* Mon May 13 2024 - Danie de Jager - 0.4.28-1 -- Initial version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/displace.rs new/sad-0.4.33/src/displace.rs --- old/sad-0.4.32/src/displace.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/displace.rs 2026-11-02 08:13:05.000000000 +0100 @@ -6,7 +6,7 @@ types::Die, udiff::{apply_patches, patches, pure_diffs, udiff}, }, - ansi_term::Colour, + ansi_term::Style, std::{borrow::ToOwned, ffi::OsString, path::PathBuf, sync::Arc}, tokio::task::spawn_blocking, }; @@ -86,7 +86,7 @@ } else { let mut fzf_lines = OsString::new(); for range in ranges { - let repr = Colour::Red.paint(format!("{range}")); + let repr = Style::new().dimmed().paint(format!("{range}")); fzf_lines.push(&name); let line = format!("\x04 {repr}\0"); fzf_lines.push(&line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/fs_pipe.rs new/sad-0.4.33/src/fs_pipe.rs --- old/sad-0.4.32/src/fs_pipe.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/fs_pipe.rs 2026-11-02 08:13:05.000000000 +0100 @@ -44,7 +44,7 @@ } } } - }; + } Ok(slurm) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/fzf.rs new/sad-0.4.33/src/fzf.rs --- old/sad-0.4.32/src/fzf.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/fzf.rs 2026-11-02 08:13:05.000000000 +0100 @@ -56,6 +56,8 @@ "--print0".to_owned(), "-m".to_owned(), "--ansi".to_owned(), + "--delimiter=\x04".to_owned(), + "--nth=..-2".to_owned(), "--preview-window=70%:wrap".to_owned(), format!("--bind=enter:{execute}"), format!("--bind=double-click:{execute}"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/main.rs new/sad-0.4.33/src/main.rs --- old/sad-0.4.32/src/main.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/main.rs 2026-11-02 08:13:05.000000000 +0100 @@ -21,7 +21,7 @@ displace::displace, futures::{ future::{ready, Either}, - stream::{once, select, Stream, StreamExt, TryStreamExt}, + stream::{Stream, StreamExt, TryStreamExt}, }, fzf::stream_fzf_proc, input::stream_in, @@ -30,13 +30,12 @@ ffi::OsString, marker::Unpin, path::PathBuf, - pin::pin, - process::{ExitCode, Termination}, + process::{exit, ExitCode, Termination}, sync::Arc, thread::available_parallelism, }, subprocess::{stream_into, stream_subproc}, - tokio::{io, runtime::Builder, signal::ctrl_c}, + tokio::{io, runtime::Builder}, types::Die, }; @@ -58,26 +57,6 @@ } } -async fn consume(stream: impl Stream<Item = Result<(), Die>> + Send) -> Result<(), Die> { - let int = once(async { - match ctrl_c().await { - Err(e) => Die::IO(PathBuf::from("sigint"), e.kind()), - Ok(()) => Die::Interrupt, - } - }); - let out = select( - stream - .filter_map(|row| ready(row.err())) - .chain(once(ready(Die::Eof))), - int, - ); - let mut out = pin!(out); - match out.next().await { - None | Some(Die::Eof) => Ok(()), - Some(e) => Err(e), - } -} - async fn run(threads: usize) -> Result<(), Die> { let (mode, args) = parse_args(); let input_stream = stream_in(&mode, &args).await; @@ -88,11 +67,11 @@ .try_buffer_unordered(threads); let out_stream = stream_sink(&opts, trans_stream.boxed()); - consume(out_stream).await + out_stream.try_for_each(|()| ready(Ok(()))).await } fn main() -> impl Termination { - let threads = available_parallelism().map(Into::into).unwrap_or(6); + let threads = available_parallelism().map_or(6, Into::into); let rt = Builder::new_multi_thread() .enable_io() .build() @@ -100,8 +79,7 @@ match rt.block_on(run(threads)).err() { None => ExitCode::SUCCESS, - // TODO: 0xC000013Au32 for windows - Some(Die::Interrupt) => ExitCode::from(130), + Some(Die::Interrupt) => exit(130), Some(e) => { eprintln!("{}", Colour::Red.paint(format!("{e}"))); ExitCode::FAILURE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/types.rs new/sad-0.4.33/src/types.rs --- old/sad-0.4.32/src/types.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/types.rs 2026-11-02 08:13:05.000000000 +0100 @@ -15,7 +15,6 @@ ArgumentError(String), BadExit(PathBuf, i32), BuildError(BuildError), - Eof, IO(PathBuf, ErrorKind), Interrupt, Join(JoinError), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sad-0.4.32/src/udiff.rs new/sad-0.4.33/src/udiff.rs --- old/sad-0.4.32/src/udiff.rs 2025-02-03 20:15:20.000000000 +0100 +++ new/sad-0.4.33/src/udiff.rs 2026-11-02 08:13:05.000000000 +0100 @@ -145,7 +145,7 @@ if !ranges.contains(&range) { continue; } - }; + } ret.push(format!("{range}\n")); ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/sad/vendor.tar.zst /work/SRC/openSUSE:Factory/.sad.new.1251/vendor.tar.zst differ: char 7, line 1
