From e3abf40c77d68090509c9aef710d08c48791f091 Mon Sep 17 00:00:00 2001 From: Mike Foster Date: Thu, 27 Aug 2026 04:45:14 +0000 Subject: [PATCH 1/3] bump try_v2 & ninja-build_rs --- ninja-xtask/Cargo.lock | 377 +++++++++++++---------------------------- ninja-xtask/Cargo.toml | 7 +- 2 files changed, 121 insertions(+), 263 deletions(-) diff --git a/ninja-xtask/Cargo.lock b/ninja-xtask/Cargo.lock index 6b3f15f..0531774 100644 --- a/ninja-xtask/Cargo.lock +++ b/ninja-xtask/Cargo.lock @@ -52,12 +52,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - [[package]] name = "autocfg" version = "1.5.1" @@ -70,6 +64,17 @@ version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" +[[package]] +name = "build_safely" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4aa79039c986a2c080fcd86f6c71b3524f15d9479a0102225d7a94d3b4486a" +dependencies = [ + "autocfg", + "derive_more", + "indexmap", +] + [[package]] name = "camino" version = "1.2.5" @@ -150,7 +155,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -189,18 +194,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -208,27 +213,27 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "derive_more" @@ -249,7 +254,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.118", + "syn 2.0.119", "unicode-xid", ] @@ -266,9 +271,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "equivalent" @@ -295,51 +300,34 @@ dependencies = [ "autocfg", "ninja-build_rs 0.2.1", "proc-macro2", - "proc_macro2_diagnostic", + "proc_macro2_diagnostic 0.6.6", "quote", - "syn 2.0.118", - "try_v2", + "syn 2.0.119", + "try_v2 0.9.3", ] [[package]] name = "fastrand" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" - -[[package]] -name = "foldhash" -version = "0.1.5" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", "r-efi", - "wasip2", - "wasip3", -] - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", ] [[package]] name = "hashbrown" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -347,12 +335,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "indexmap" version = "2.14.0" @@ -360,9 +342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", - "serde", - "serde_core", + "hashbrown", ] [[package]] @@ -387,17 +367,11 @@ dependencies = [ "rayon", ] -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" -version = "0.2.186" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "linux-raw-sys" @@ -407,15 +381,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" -version = "0.4.29" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "ninja-build_rs" @@ -428,17 +402,16 @@ dependencies = [ [[package]] name = "ninja-build_rs" -version = "0.3.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6720c3e3e82280cd954a93e999da565924aab15e13716b08cea9c0ce6f0d70" +checksum = "eb9b78c649094117681a6950c22a05a0e27972068ff56aeb4064a3eb3e63013e" dependencies = [ - "autocfg", - "derive_more", + "build_safely", ] [[package]] name = "ninja-xtask" -version = "0.3.1" +version = "0.3.2" dependencies = [ "autocfg", "bitflags", @@ -447,11 +420,11 @@ dependencies = [ "clap-cargo", "dircpy", "exit_safely", - "ninja-build_rs 0.3.0", + "ninja-build_rs 0.5.4", "serde", "serde_json", "tempfile", - "try_v2", + "try_v2 0.10.1", ] [[package]] @@ -466,21 +439,11 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.118", -] - [[package]] name = "proc-macro2" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] @@ -494,15 +457,27 @@ dependencies = [ "autocfg", "ninja-build_rs 0.2.1", "proc-macro2", - "syn 2.0.118", - "try_v2_traits", + "syn 2.0.119", + "try_v2_traits 0.9.3", +] + +[[package]] +name = "proc_macro2_diagnostic" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98216f5c14bf8eec9b009fd78de5eb657926243bb2aaf2e559af5a3eae7d6913" +dependencies = [ + "build_safely", + "proc-macro2", + "syn 2.0.119", + "try_v2_traits 0.10.1", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] @@ -601,7 +576,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -625,9 +600,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -636,9 +611,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f" dependencies = [ "proc-macro2", "quote", @@ -675,45 +650,81 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] name = "try_v2" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d8e9729eb9fbf4702a26a3d30b9a9b97683a47b352a5e35e74e4a1e9ca6511" +checksum = "67ffb9d21d6cef28147970315080cd8ea3677229d95ecbf1c7784ebde1569079" dependencies = [ "autocfg", "ninja-build_rs 0.2.1", - "try_v2_derive", - "try_v2_traits", + "try_v2_derive 0.9.3", + "try_v2_traits 0.9.3", +] + +[[package]] +name = "try_v2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "036ac5e964339c6b1c3b11bcb46278786c8c8882903920c57bfea84fa2ebf414" +dependencies = [ + "autocfg", + "build_safely", + "try_v2_derive 0.10.1", + "try_v2_traits 0.10.1", ] [[package]] name = "try_v2_derive" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afaedacb5eac11c51ef85fafb90e1c7d4a29fd334104ff3053f065e0c6ee246" +checksum = "c78021c5823ca5c8d0953316b41eaeee18f8db19797d643719c40da069283a0b" dependencies = [ "autocfg", "ninja-build_rs 0.2.1", "proc-macro2", - "proc_macro2_diagnostic", + "proc_macro2_diagnostic 0.6.6", "quote", - "syn 2.0.118", + "syn 2.0.119", +] + +[[package]] +name = "try_v2_derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a744c58d9ab0eca2934858fadb325dd796e6112a2d973e920e3ba613bba42da" +dependencies = [ + "autocfg", + "build_safely", + "proc-macro2", + "proc_macro2_diagnostic 0.7.0", + "quote", + "syn 2.0.119", ] [[package]] name = "try_v2_traits" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bedaca520dfad05da0a5ac3540651330c1ee9ee11e45bb1d880e3a20c52b9" +checksum = "8eabf8e03f61b267750fdc70e9db431aa8ed83bfc5368016c020b141d46beab8" dependencies = [ "autocfg", "ninja-build_rs 0.2.1", ] +[[package]] +name = "try_v2_traits" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625990d998c1436aeb59720750929fe4efaebc940b5f802b0da0efeed4167a17" +dependencies = [ + "autocfg", + "build_safely", +] + [[package]] name = "unicode-ident" version = "1.0.24" @@ -748,58 +759,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasip2" -version = "1.0.3+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" -dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "winapi-util" version = "0.1.11" @@ -824,106 +783,8 @@ dependencies = [ "windows-link", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn 2.0.118", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.118", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" - -[[patch.unused]] -name = "ninja-build_rs" -version = "0.4.1" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/ninja-xtask/Cargo.toml b/ninja-xtask/Cargo.toml index 2f2d3b4..dbe2072 100644 --- a/ninja-xtask/Cargo.toml +++ b/ninja-xtask/Cargo.toml @@ -26,7 +26,7 @@ clap-cargo = "0.19.0" exit_safely = "0.3.3" serde = { version = "1.0.229", features = ["derive"] } serde_json = "1.0.151" -try_v2 = "0.9.2" +try_v2 = "0.10.1" [dev-dependencies] dircpy = "0.3.20" @@ -34,7 +34,4 @@ tempfile = "3.27.0" [build-dependencies] autocfg = "1.5.1" -ninja-build_rs = "0.3.0" - -[patch.crates-io] -ninja-build_rs.path = "../ninja-build_rs" +ninja-build_rs = "0.5.4" From 3a6286559fea739d3707272857399ef77977d649 Mon Sep 17 00:00:00 2001 From: Mike Foster Date: Thu, 27 Aug 2026 04:45:32 +0000 Subject: [PATCH 2/3] machete serde --- ninja-xtask/Cargo.lock | 1 - ninja-xtask/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/ninja-xtask/Cargo.lock b/ninja-xtask/Cargo.lock index 0531774..ab80c7f 100644 --- a/ninja-xtask/Cargo.lock +++ b/ninja-xtask/Cargo.lock @@ -421,7 +421,6 @@ dependencies = [ "dircpy", "exit_safely", "ninja-build_rs 0.5.4", - "serde", "serde_json", "tempfile", "try_v2 0.10.1", diff --git a/ninja-xtask/Cargo.toml b/ninja-xtask/Cargo.toml index dbe2072..dc23ea0 100644 --- a/ninja-xtask/Cargo.toml +++ b/ninja-xtask/Cargo.toml @@ -24,7 +24,6 @@ cargo_metadata = "0.23.1" clap = { version = "4.6.0", features = ["derive"] } clap-cargo = "0.19.0" exit_safely = "0.3.3" -serde = { version = "1.0.229", features = ["derive"] } serde_json = "1.0.151" try_v2 = "0.10.1" From 336366596d69e9c7c0aeb0ff2472f8057c6b9e2d Mon Sep 17 00:00:00 2001 From: Mike Foster Date: Thu, 27 Aug 2026 04:47:01 +0000 Subject: [PATCH 3/3] use build_safely directly --- ninja-xtask/Cargo.lock | 21 ++++++--------------- ninja-xtask/Cargo.toml | 2 +- ninja-xtask/build.rs | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/ninja-xtask/Cargo.lock b/ninja-xtask/Cargo.lock index ab80c7f..b73d685 100644 --- a/ninja-xtask/Cargo.lock +++ b/ninja-xtask/Cargo.lock @@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46d9ce1551153dd9b243b10dd0c49e724e0ad63494c1cfb18da2915088726bd7" dependencies = [ "autocfg", - "ninja-build_rs 0.2.1", + "ninja-build_rs", "proc-macro2", "proc_macro2_diagnostic 0.6.6", "quote", @@ -400,27 +400,18 @@ dependencies = [ "autocfg", ] -[[package]] -name = "ninja-build_rs" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9b78c649094117681a6950c22a05a0e27972068ff56aeb4064a3eb3e63013e" -dependencies = [ - "build_safely", -] - [[package]] name = "ninja-xtask" version = "0.3.2" dependencies = [ "autocfg", "bitflags", + "build_safely", "cargo_metadata", "clap", "clap-cargo", "dircpy", "exit_safely", - "ninja-build_rs 0.5.4", "serde_json", "tempfile", "try_v2 0.10.1", @@ -454,7 +445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09381e39ed7a26d59b191fb4466f0ee8c458603b4d92dceb177079c1a9dd22a1" dependencies = [ "autocfg", - "ninja-build_rs 0.2.1", + "ninja-build_rs", "proc-macro2", "syn 2.0.119", "try_v2_traits 0.9.3", @@ -659,7 +650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ffb9d21d6cef28147970315080cd8ea3677229d95ecbf1c7784ebde1569079" dependencies = [ "autocfg", - "ninja-build_rs 0.2.1", + "ninja-build_rs", "try_v2_derive 0.9.3", "try_v2_traits 0.9.3", ] @@ -683,7 +674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c78021c5823ca5c8d0953316b41eaeee18f8db19797d643719c40da069283a0b" dependencies = [ "autocfg", - "ninja-build_rs 0.2.1", + "ninja-build_rs", "proc-macro2", "proc_macro2_diagnostic 0.6.6", "quote", @@ -711,7 +702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eabf8e03f61b267750fdc70e9db431aa8ed83bfc5368016c020b141d46beab8" dependencies = [ "autocfg", - "ninja-build_rs 0.2.1", + "ninja-build_rs", ] [[package]] diff --git a/ninja-xtask/Cargo.toml b/ninja-xtask/Cargo.toml index dc23ea0..879f788 100644 --- a/ninja-xtask/Cargo.toml +++ b/ninja-xtask/Cargo.toml @@ -33,4 +33,4 @@ tempfile = "3.27.0" [build-dependencies] autocfg = "1.5.1" -ninja-build_rs = "0.5.4" +build_safely = "0.5.4" diff --git a/ninja-xtask/build.rs b/ninja-xtask/build.rs index dc216e2..22eb9b3 100644 --- a/ninja-xtask/build.rs +++ b/ninja-xtask/build.rs @@ -1,4 +1,4 @@ -use ninja_build_rs::prelude::*; +use build_safely::prelude::*; fn main() -> Result<()> { let allowed_features = cargo_allowed_features()?;