diff --git a/Cargo.lock b/Cargo.lock index 55fb6d9ce..d1da0f102 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "aho-corasick" version = "1.1.4" @@ -264,21 +249,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link", -] - [[package]] name = "base64" version = "0.22.1" @@ -543,21 +513,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "color-eyre" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5920befb47832a6d61ee3a3a846565cfa39b331331e68a3b1d1116630f2f26d" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - [[package]] name = "color-print" version = "0.3.7" @@ -579,18 +534,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "color-spantrace" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b88ea9df13354b55bc7234ebcce36e6ef896aca2e42a15de9e10edce01b427" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - [[package]] name = "colorchoice" version = "1.0.4" @@ -1232,9 +1175,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "frizbee" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1203300031cb4fbd90e77833d9b2455f609ba9ab7c1703990d09ebbcd8b5ef" +checksum = "a151c9ed9ab8cefc76a76b7a15292fc83575f70cf2076d238e0a3251f69738ba" [[package]] name = "fs2" @@ -1394,12 +1337,6 @@ dependencies = [ "r-efi 6.0.0", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "glob" version = "0.3.3" @@ -1904,15 +1841,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "1.2.1" @@ -2118,15 +2046,6 @@ dependencies = [ "objc2-core-foundation", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.4" @@ -2186,12 +2105,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b2d2086a3a477709f0208181e65857a9c062064ab2b3bb9abaf64f17d148bf3" -[[package]] -name = "owo-colors" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" - [[package]] name = "page_size" version = "0.6.0" @@ -2819,12 +2732,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "rustc-demangle" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -3148,16 +3055,16 @@ checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "skim" -version = "5.1.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1044cbd6a9ea36b2f19c6ec62520467d0cd90e12f190e40ae8c465aeaf2e97" +checksum = "b31a416c645241f7456b9a1e9d20776eaa0458c368a400f2f680c94f0db5f5b4" dependencies = [ "ansi-to-tui", "assert_enum_variants", - "color-eyre", "crossterm", "derive_builder", "derive_more", + "eyre", "frizbee", "futures", "indexmap", @@ -3688,16 +3595,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-error" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" -dependencies = [ - "tracing", - "tracing-subscriber", -] - [[package]] name = "tracing-log" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index 6f38dc8d9..247c9881e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -283,12 +283,14 @@ wait-timeout = "0.2" # API, and earlier 4.x compile against an incompatible ratatui (`-Z # minimal-versions` otherwise resolves skim 4.6 against ratatui 0.30.1 and fails # to build). -# Held at 5.1.0: skim 5.3.1 (bumped in #3526) regresses the picker on the legacy -# Windows console — every picker PTY test fails with "Keyboard progressive -# enhancement not implemented for the legacy Windows API", reddening -# `test (windows)`. 5.1.0 is the last Windows-green release; unpin once the -# keyboard-enhancement path is guarded for the legacy console. -skim = { version = "=5.1.0", optional = true, default-features = false, features = ["frizbee"] } +# skim 5.3.1 (bumped in #3526) regressed the picker on the legacy Windows +# console — every picker PTY test failed with "Keyboard progressive enhancement +# not implemented for the legacy Windows API", reddening the Windows test job, +# so the pin held at the last-Windows-green 5.1.0. 5.5.0 guards that path ("Do +# not panic on push/pop keyboard enhancement flags failure") and is +# Windows-green again. Kept as an exact pin; it can relax to a range now that +# the keyboard-enhancement path no longer regresses the legacy console. +skim = { version = "=5.5.0", optional = true, default-features = false, features = ["frizbee"] } # Pinned to skim's ratatui line so the `Line` type `display()` returns is the # same one skim consumes. `ansi-to-tui` parses ANSI SGR codes into ratatui spans. # Floor is 0.30.1: 0.30.0 is a broken release (its `#[instability::unstable]`