From 5b844f630c2a48d9cb0b7b0d5d2e6b909c7ae8f2 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Wed, 13 Nov 2024 09:04:44 -0800 Subject: [PATCH] cargo: upgrade to `sapling-renderdag` There is now an updated version of `esl01-renderdag` published from the Sapling repo, so let's use that. That lets us remove the `bitflags` 1.x dependency and the `itertools` 0.10.x non-dev dependency. --- Cargo.lock | 56 +++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- cli/Cargo.toml | 2 +- lib/Cargo.toml | 2 +- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecf5996ed9..9bbaa791e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -193,17 +193,14 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "blake2" @@ -577,7 +574,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.6.0", + "bitflags", "crossterm_winapi", "libc", "mio 0.8.11", @@ -719,16 +716,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "esl01-renderdag" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1840969ab8be31e186bb6d2f672d586dcd203dd4019a80dc1277a14686eca9" -dependencies = [ - "bitflags 1.3.2", - "itertools 0.10.5", -] - [[package]] name = "faster-hex" version = "0.9.0" @@ -920,7 +907,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", "libgit2-sys", "log", @@ -1077,7 +1064,7 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03f76169faa0dec598eac60f83d7fcdd739ec16596eca8fb144c88973dbe6f8c" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "gix-path", "libc", @@ -1191,7 +1178,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "gix-features", "gix-path", @@ -1237,7 +1224,7 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cd4203244444017682176e65fd0180be9298e58ed90bd4a8489a357795ed22d" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "filetime", "fnv", @@ -1359,7 +1346,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d23bf239532b4414d0e63b8ab3a65481881f7237ed9647bb10c1e3cc54c5ceb" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bstr", "gix-attributes", "gix-config-value", @@ -1449,7 +1436,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fe4d52f30a737bbece5276fab5d3a8b276dc2650df963e293d0673be34e7a5f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "gix-path", "libc", "windows-sys 0.52.0", @@ -1496,7 +1483,7 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "030da39af94e4df35472e9318228f36530989327906f38e27807df305fccb780" dependencies = [ - "bitflags 2.6.0", + "bitflags", "gix-commitgraph", "gix-date", "gix-hash", @@ -1830,7 +1817,6 @@ dependencies = [ "crossterm", "dirs", "dunce", - "esl01-renderdag", "futures 0.3.31", "git2", "gix", @@ -1850,6 +1836,7 @@ dependencies = [ "rayon", "regex", "rpassword", + "sapling-renderdag", "scm-record", "serde", "slab", @@ -1882,7 +1869,6 @@ dependencies = [ "criterion", "digest", "either", - "esl01-renderdag", "futures 0.3.31", "git2", "gix", @@ -1911,6 +1897,7 @@ dependencies = [ "regex", "rustix", "same-file", + "sapling-renderdag", "serde", "serde_json", "smallvec", @@ -1996,7 +1983,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", "redox_syscall", ] @@ -2583,7 +2570,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cassowary", "compact_str", "crossterm", @@ -2624,7 +2611,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -2741,7 +2728,7 @@ version = "0.38.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -2769,6 +2756,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "sapling-renderdag" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edffb89cab87bd0901c5749d576f5d37a1f34e05160e936f463f4e94cc447b61" +dependencies = [ + "bitflags", +] + [[package]] name = "scanlex" version = "0.1.4" diff --git a/Cargo.toml b/Cargo.toml index 1aa5c167d7..41616eebc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ digest = "0.10.7" dirs = "5.0.1" dunce = "1.0.5" either = "1.13.0" -esl01-renderdag = "0.3.0" +sapling-renderdag = "0.1.0" futures = "0.3.31" git2 = { version = "0.19.0", features = [ # Do *not* disable this feature even if you'd like dynamic linking. Instead, diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 96db2e855b..7bffd50c2e 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -61,7 +61,7 @@ criterion = { workspace = true, optional = true } crossterm = { workspace = true } dirs = { workspace = true } dunce = { workspace = true } -esl01-renderdag = { workspace = true } +sapling-renderdag = { workspace = true } futures = { workspace = true } git2 = { workspace = true } gix = { workspace = true } diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 75287c427b..246486aa16 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -86,7 +86,7 @@ winreg = { workspace = true } [dev-dependencies] assert_matches = { workspace = true } criterion = { workspace = true } -esl01-renderdag = { workspace = true } +sapling-renderdag = { workspace = true } indoc = { workspace = true } insta = { workspace = true } num_cpus = { workspace = true }