From 3d417f77427a12c66c2490dbb9b5da672fbefe50 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 10 Jan 2024 21:48:05 +0100 Subject: [PATCH] Update the toml crate This fixes serialization of the config when using specifying that packages should be downloaded as binary. --- Cargo.lock | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++---- Cargo.toml | 2 +- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 833ee2e41f..01bde30e41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -481,6 +481,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.8" @@ -634,6 +640,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -742,7 +754,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", ] [[package]] @@ -995,7 +1017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -1047,7 +1069,7 @@ dependencies = [ "serde", "sodiumoxide", "termion 1.5.6", - "toml", + "toml 0.5.11", "user-error", ] @@ -1159,7 +1181,7 @@ dependencies = [ "serde", "serde_derive", "termion 1.5.6", - "toml", + "toml 0.8.8", "uuid", ] @@ -1186,7 +1208,7 @@ dependencies = [ "clap", "hyper", "hyper-rustls", - "indexmap", + "indexmap 1.9.3", "libflate", "pbr", "petgraph", @@ -1195,7 +1217,7 @@ dependencies = [ "serde_derive", "sha3", "tar", - "toml", + "toml 0.5.11", "version-compare", ] @@ -1415,6 +1437,15 @@ dependencies = [ "syn 2.0.41", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "sha3" version = "0.9.1" @@ -1613,6 +1644,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "traitobject" version = "0.1.0" @@ -2097,6 +2162,15 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + [[package]] name = "xattr" version = "1.1.3" diff --git a/Cargo.toml b/Cargo.toml index 38f062ec90..cb557168b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ rust-argon2 = "0.8.2" serde = "1.0.110" serde_derive = "1.0.110" termion = "1.5.5" -toml = "0.5.6" +toml = "0.8.8" uuid = { version = "1.4", features = ["v4"] } [patch.crates-io]