From 0621858125ee81f3cb1af156f94502034d9170eb Mon Sep 17 00:00:00 2001 From: arty Date: Thu, 17 Oct 2024 14:25:32 -0700 Subject: [PATCH] Update rust-yaml to rust-yaml2 --- Cargo.lock | 44 ++++++++++++++++++++++++---------- Cargo.toml | 4 ++-- src/classic/clvm_tools/cmds.rs | 4 ++-- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a74cdc88..384c41af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,6 +35,12 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "autocfg" version = "1.1.0" @@ -211,12 +217,12 @@ dependencies = [ "do-notation", "encoding8", "getrandom", + "hashlink", "hex", "indoc 1.0.9", "js-sys", "lazy_static", "lfsr", - "linked-hash-map", "num", "num-bigint", "num-traits", @@ -232,7 +238,7 @@ dependencies = [ "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-test", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -394,6 +400,15 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3144e455c7aeda487c72555cac2ef84ccac173b29a57b07382ba27016e57b246" +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -495,6 +510,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown", +] + [[package]] name = "heck" version = "0.4.1" @@ -673,12 +697,6 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.3" @@ -1598,12 +1616,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3a391fab..69857171 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,8 @@ sha2 = "0.9.5" tempfile = "3.3.0" clvmr = { version = "0.8.0", features = ["pre-eval"] } binascii = "0.1.4" -yaml-rust = "0.4" -linked-hash-map = "0.5.6" +yaml-rust2 = "0.9" +hashlink = "0.9.1" serde = { version = "1.0", features = ["derive", "rc"] } regex = "1.8.4" rand = { version = "0.8.5", optional = true } diff --git a/src/classic/clvm_tools/cmds.rs b/src/classic/clvm_tools/cmds.rs index 7607b489..e6a5930a 100644 --- a/src/classic/clvm_tools/cmds.rs +++ b/src/classic/clvm_tools/cmds.rs @@ -14,8 +14,8 @@ use std::time::SystemTime; use core::cmp::max; -use linked_hash_map::LinkedHashMap; -use yaml_rust::{Yaml, YamlEmitter}; +use hashlink::LinkedHashMap; +use yaml_rust2::{Yaml, YamlEmitter}; use clvm_rs::allocator::{Allocator, NodePtr}; use clvm_rs::reduction::EvalErr;