From 19f69af4889cd7dd04c7931e072370737d3e0350 Mon Sep 17 00:00:00 2001 From: Jordan Doyle Date: Sat, 28 Sep 2024 17:13:56 +0400 Subject: [PATCH] Reduce gix dependency set --- Cargo.lock | 225 +---------------------------------------------------- Cargo.toml | 10 +-- 2 files changed, 8 insertions(+), 227 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fe0f20..afcba74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,12 +115,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - [[package]] name = "askama" version = "0.12.1" @@ -1163,15 +1157,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9048b8d1ae2104f045cb37e5c450fc49d5d8af22609386bfc739c11ba88995eb" dependencies = [ "gix-actor", - "gix-archive", "gix-attributes", "gix-command", "gix-commitgraph", "gix-config", - "gix-credentials", "gix-date", "gix-diff", - "gix-dir", "gix-discover", "gix-features", "gix-filter", @@ -1182,20 +1173,16 @@ dependencies = [ "gix-ignore", "gix-index", "gix-lock", - "gix-mailmap", - "gix-negotiate", "gix-object", "gix-odb", "gix-pack", "gix-path", "gix-pathspec", - "gix-prompt", "gix-ref", "gix-refspec", "gix-revision", "gix-revwalk", "gix-sec", - "gix-status", "gix-submodule", "gix-tempfile", "gix-trace", @@ -1204,12 +1191,7 @@ dependencies = [ "gix-utils", "gix-validate", "gix-worktree", - "gix-worktree-state", - "gix-worktree-stream", "once_cell", - "parking_lot", - "regex", - "signal-hook", "smallvec", "thiserror", ] @@ -1228,20 +1210,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "gix-archive" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9147c08a55c1398b755539e2cdd63ff690ffe4a2e5e5e0780ee6ef2b49b0a60a" -dependencies = [ - "bstr", - "gix-date", - "gix-object", - "gix-worktree-stream", - "jiff", - "thiserror", -] - [[package]] name = "gix-attributes" version = "0.22.5" @@ -1337,23 +1305,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-credentials" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce391d305968782f1ae301c4a3d42c5701df7ff1d8bc03740300f6fd12bce78" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-trace", - "gix-url", - "thiserror", -] - [[package]] name = "gix-date" version = "0.9.0" @@ -1386,26 +1337,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-dir" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed3a9076661359a1c5a27c12ad6c3ebe2dd96b8b3c0af6488ab7c128b7bdd98" -dependencies = [ - "bstr", - "gix-discover", - "gix-fs", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-trace", - "gix-utils", - "gix-worktree", - "thiserror", -] - [[package]] name = "gix-discover" version = "0.35.0" @@ -1428,8 +1359,6 @@ version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" dependencies = [ - "bytes", - "bytesize", "crc32fast", "crossbeam-channel", "flate2", @@ -1563,34 +1492,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-mailmap" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d522c8ec2501e1a5b2b4cb54e83cb5d9a52471c9d23b3a1e8dadaf063752f7" -dependencies = [ - "bstr", - "gix-actor", - "gix-date", - "thiserror", -] - -[[package]] -name = "gix-negotiate" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4063bf329a191a9e24b6f948a17ccf6698c0380297f5e169cee4f1d2ab9475b" -dependencies = [ - "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] - [[package]] name = "gix-object" version = "0.44.0" @@ -1646,7 +1547,6 @@ dependencies = [ "memmap2", "smallvec", "thiserror", - "uluru", ] [[package]] @@ -1689,19 +1589,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-prompt" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fde865cdb46b30d8dad1293385d9bcf998d3a39cbf41bee67d0dab026fe6b1" -dependencies = [ - "gix-command", - "gix-config-value", - "parking_lot", - "rustix", - "thiserror", -] - [[package]] name = "gix-quote" version = "0.4.12" @@ -1791,29 +1678,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "gix-status" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f70d35ba639f0c16a6e4cca81aa374a05f07b23fa36ee8beb72c100d98b4ffea" -dependencies = [ - "bstr", - "filetime", - "gix-diff", - "gix-dir", - "gix-features", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-worktree", - "portable-atomic", - "thiserror", -] - [[package]] name = "gix-submodule" version = "0.14.0" @@ -1840,8 +1704,6 @@ dependencies = [ "libc", "once_cell", "parking_lot", - "signal-hook", - "signal-hook-registry", "tempfile", ] @@ -1850,6 +1712,9 @@ name = "gix-trace" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b" +dependencies = [ + "tracing-core", +] [[package]] name = "gix-traverse" @@ -1888,7 +1753,6 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" dependencies = [ - "bstr", "fastrand", "unicode-normalization", ] @@ -1922,44 +1786,6 @@ dependencies = [ "gix-validate", ] -[[package]] -name = "gix-worktree-state" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b05c4b313fa702c0bacd5068dd3e01671da73b938fade97676859fee286de43" -dependencies = [ - "bstr", - "gix-features", - "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-worktree", - "io-close", - "thiserror", -] - -[[package]] -name = "gix-worktree-stream" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e81b87c1a3ece22a54b682d6fdc37fbb3977132da972cafe5ec07175fddbca" -dependencies = [ - "gix-attributes", - "gix-features", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-object", - "gix-path", - "gix-traverse", - "parking_lot", - "thiserror", -] - [[package]] name = "glob" version = "0.3.1" @@ -2100,12 +1926,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "human_format" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" - [[package]] name = "humansize" version = "2.1.3" @@ -2220,16 +2040,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2752,12 +2562,6 @@ dependencies = [ "time", ] -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2787,10 +2591,6 @@ name = "prodash" version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" -dependencies = [ - "bytesize", - "human_format", -] [[package]] name = "proptest" @@ -3253,16 +3053,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3760,15 +3550,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "uluru" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" -dependencies = [ - "arrayvec", -] - [[package]] name = "unarray" version = "0.1.4" diff --git a/Cargo.toml b/Cargo.toml index 2cbeaeb..5afb434 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,8 @@ license = "WTFPL" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arc-swap = "1.7" anyhow = "1.0" +arc-swap = "1.7" askama = "0.12.0" axum = { version = "0.7", features = ["macros"] } axum-macros = "0.4.1" @@ -20,13 +20,13 @@ bat = { version = "0.24.0", default-features = false, features = [ bincode = "1.3" bytes = "1.5" clap = { version = "4.4.10", features = ["cargo", "derive"] } -const-hex = "1.12" -const_format = "0.2" comrak = "0.28.0" console-subscriber = { version = "0.4", features = ["parking_lot"] } +const-hex = "1.12" +const_format = "0.2" flate2 = { version = "1.0", default-features = false, features = ["zlib-ng"] } futures = "0.3" -gix = { version = "0.66", features = ["fast-sha1", "zlib-ng"] } +gix = { version = "0.66", default-features = false, features = ["fast-sha1", "zlib-ng", "tracing", "parallel", "blob-diff", "revision"] } httparse = "1.7" humantime = "2.1" itertools = "0.13.0" @@ -52,8 +52,8 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } unix_mode = "0.1" uuid = { version = "1.7", features = ["v4"] } -yoke = { version = "0.7.1", features = ["derive"] } xxhash-rust = { version = "0.8.12", features = ["const_xxh3"] } +yoke = { version = "0.7.1", features = ["derive"] } [build-dependencies] anyhow = "1.0"