From 9a6613832189620f71a25a3f029f934b7f036cb3 Mon Sep 17 00:00:00 2001 From: nichmor Date: Fri, 15 Nov 2024 15:19:44 +0200 Subject: [PATCH] misc: use default features by default --- Cargo.lock | 109 +++-------------------------------------------------- Cargo.toml | 21 +++++------ 2 files changed, 15 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c26cdc2f3..da7624be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,12 +514,6 @@ dependencies = [ "piper", ] -[[package]] -name = "boxcar" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f839cdf7e2d3198ac6ca003fd8ebc61715755f41c1cad15ff13df67531e00ed" - [[package]] name = "bstr" version = "1.10.0" @@ -2923,15 +2917,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -3113,18 +3098,6 @@ dependencies = [ "unicode-width 0.1.14", ] -[[package]] -name = "pep440_rs" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7" -dependencies = [ - "serde", - "unicode-width 0.2.0", - "unscanny", - "version-ranges", -] - [[package]] name = "pep508_rs" version = "0.3.0" @@ -3132,7 +3105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "910c513bea0f4f833122321c0f20e8c704e01de98692f6989c2ec21f43d88b1e" dependencies = [ "once_cell", - "pep440_rs 0.4.0", + "pep440_rs", "regex", "serde", "thiserror 1.0.68", @@ -3141,28 +3114,6 @@ dependencies = [ "url", ] -[[package]] -name = "pep508_rs" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2feee999fa547bacab06a4881bacc74688858b92fa8ef1e206c748b0a76048" -dependencies = [ - "boxcar", - "indexmap 2.6.0", - "itertools 0.13.0", - "once_cell", - "pep440_rs 0.7.2", - "regex", - "rustc-hash", - "serde", - "smallvec", - "thiserror 1.0.68", - "unicode-width 0.2.0", - "url", - "urlencoding", - "version-ranges", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -3380,8 +3331,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" dependencies = [ "indexmap 2.6.0", - "pep440_rs 0.4.0", - "pep508_rs 0.3.0", + "pep440_rs", + "pep508_rs", "serde", "toml", ] @@ -3598,7 +3549,6 @@ dependencies = [ "rattler_digest 1.0.3 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", "rattler_index", "rattler_installs_packages", - "rattler_lock", "rattler_networking 0.21.5 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", "rattler_package_streaming 0.22.11 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", "rattler_redaction 0.1.3 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", @@ -3839,8 +3789,8 @@ dependencies = [ "parking_lot", "pathdiff", "peg", - "pep440_rs 0.4.0", - "pep508_rs 0.3.0", + "pep440_rs", + "pep508_rs", "pin-project-lite", "pyproject-toml", "rattler_digest 0.19.5", @@ -3864,30 +3814,6 @@ dependencies = [ "zip 0.6.6", ] -[[package]] -name = "rattler_lock" -version = "0.22.29" -source = "git+https://github.com/conda/rattler?branch=feat/pixi-build#cc6299ef9549bc1a8ede877d25a2d6020abd4efb" -dependencies = [ - "chrono", - "file_url 0.1.7 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", - "fxhash", - "indexmap 2.6.0", - "itertools 0.13.0", - "pep440_rs 0.7.2", - "pep508_rs 0.9.1", - "rattler_conda_types 0.29.0 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", - "rattler_digest 1.0.3 (git+https://github.com/conda/rattler?branch=feat/pixi-build)", - "serde", - "serde-value", - "serde_repr", - "serde_with", - "serde_yaml", - "thiserror 1.0.68", - "typed-path", - "url", -] - [[package]] name = "rattler_macros" version = "1.0.3" @@ -4673,16 +4599,6 @@ dependencies = [ "typeid", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.215" @@ -5643,12 +5559,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "unscanny" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" - [[package]] name = "untrusted" version = "0.9.0" @@ -5731,15 +5641,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version-ranges" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284649eba55872c1253f3f6ec15f22303a784e60684babd01d01e4c6ebb85b91" -dependencies = [ - "smallvec", -] - [[package]] name = "version_check" version = "0.9.5" diff --git a/Cargo.toml b/Cargo.toml index d9f939ae3..f3ed8642b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -143,18 +143,17 @@ async-recursion = "1.1.1" # rattler_virtual_packages = { version = "1.1.8", default-features = false } # rattler_package_streaming = { version = "0.22.11", default-features = false } rattler = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false, features = ["cli-tools", "indicatif"]} -rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_cache = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_digest = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" , features = ["serde"]} -rattler_lock = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_networking = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_package_streaming = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", features = ["gateway"] } +rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false } +rattler_cache = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false} +rattler_digest = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" , default-features = false, features = ["serde"]} +rattler_networking = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false} +rattler_package_streaming = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false} +rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false, features = ["gateway"] } rattler_redaction = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_index = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } -rattler_shell = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", features = ["sysinfo"]} -rattler_solve = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" , features = ["resolvo", "serde"]} -rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" } +rattler_index = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false} +rattler_shell = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false, features = ["sysinfo"]} +rattler_solve = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build" , default-features = false, features = ["resolvo", "serde"]} +rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "feat/pixi-build", default-features = false} lazy_static = "1.5.0"