diff --git a/Cargo.lock b/Cargo.lock index ee4999d5bd..c9e145195a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -618,22 +618,6 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.6.0", - "crossterm_winapi", - "libc", - "mio 0.8.11", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.28.1" @@ -642,7 +626,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.6.0", "crossterm_winapi", - "mio 1.0.2", + "mio", "parking_lot", "rustix", "signal-hook", @@ -2176,7 +2160,7 @@ dependencies = [ "clap_complete_nushell", "clap_mangen", "criterion", - "crossterm 0.28.1", + "crossterm", "dirs 5.0.1", "dunce", "futures 0.3.31", @@ -2191,7 +2175,6 @@ dependencies = [ "jj-lib", "libc", "maplit", - "minus", "once_cell", "os_pipe", "pest", @@ -2535,33 +2518,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "minus" -version = "5.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093bd0520d2a37943566a73750e6d44094dac75d66a978d1f0d97ffc78686832" -dependencies = [ - "crossbeam-channel", - "crossterm 0.27.0", - "once_cell", - "parking_lot", - "regex", - "textwrap", - "thiserror 1.0.69", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.2" @@ -2671,9 +2627,6 @@ name = "once_cell" version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -dependencies = [ - "parking_lot_core", -] [[package]] name = "oorandom" @@ -3110,7 +3063,7 @@ dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", - "crossterm 0.28.1", + "crossterm", "indoc", "instability", "itertools 0.13.0", @@ -3342,7 +3295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2165c1b15fb2285ed7d1c281501826d451ffa3bf4928de95020a1a103e2c256" dependencies = [ "cassowary", - "crossterm 0.28.1", + "crossterm", "num-traits", "ratatui", "serde", @@ -3516,8 +3469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", - "mio 1.0.2", + "mio", "signal-hook", ] @@ -3919,7 +3871,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", diff --git a/Cargo.toml b/Cargo.toml index 730e490d3d..35a2a4dcf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ insta = { version = "1.42.0", features = ["filters"] } itertools = "0.13.0" libc = { version = "0.2.169" } maplit = "1.0.2" -minus = { version = "5.6.1", features = ["dynamic_output", "search"] } num_cpus = "1.16.0" once_cell = "1.20.2" os_pipe = "1.2.1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 3de3b0e830..53036bd677 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -69,7 +69,6 @@ indoc = { workspace = true } itertools = { workspace = true } jj-lib = { workspace = true } maplit = { workspace = true } -minus = { workspace = true } once_cell = { workspace = true } os_pipe = { workspace = true } pest = { workspace = true }