diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv index 7774c40c..424314bc 100644 --- a/Cargo.lock.msrv +++ b/Cargo.lock.msrv @@ -11,12 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - [[package]] name = "base64" version = "0.13.1" @@ -61,7 +55,7 @@ dependencies = [ [[package]] name = "cargo-insta" -version = "1.33.0" +version = "1.36.1" dependencies = [ "cargo_metadata", "console", @@ -74,6 +68,7 @@ dependencies = [ "syn", "tempfile", "uuid", + "walkdir", ] [[package]] @@ -144,64 +139,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.11" @@ -254,23 +191,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dircpy" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8466f8d28ca6da4c9dfbbef6ad4bff6f2fdd5e412d821025b0d3f0a9d74a8c1e" -dependencies = [ - "jwalk", - "log", - "walkdir", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - [[package]] name = "encode_unicode" version = "0.3.6" @@ -382,7 +302,7 @@ dependencies = [ [[package]] name = "insta" -version = "1.33.0" +version = "1.36.1" dependencies = [ "console", "csv", @@ -398,7 +318,7 @@ dependencies = [ "similar-asserts", "toml", "walkdir", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -410,16 +330,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "integration-tests" -version = "0.1.0" -dependencies = [ - "dircpy", - "insta", - "serde", - "walkdir", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -443,16 +353,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -[[package]] -name = "jwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" -dependencies = [ - "crossbeam", - "rayon", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -492,20 +392,11 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "once_cell" -version = "1.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pest" @@ -577,42 +468,22 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -685,12 +556,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "semver" version = "1.0.19" @@ -702,18 +567,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.144" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -1098,10 +963,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "ee28fa5797c86e9be3bf58e14a2c3851babd801fe050c9b698d37998964cdf99" dependencies = [ "linked-hash-map", ] diff --git a/Cargo.toml b/Cargo.toml index 2d435e77..bb5fb14a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ globset = { version = "0.4.6", optional = true } walkdir = { version = "2.3.1", optional = true } similar = { version = "2.1.0", features = ["inline"] } regex = { version = "1.6.0", default-features = false, optional = true, features = ["std", "unicode"] } -yaml-rust = "0.4.5" +yaml-rust2 = "0.5.0" serde = { version = "1.0.117", optional = true } linked-hash-map = "0.5.6" lazy_static = "1.4.0" diff --git a/src/content/yaml.rs b/src/content/yaml.rs index 15a961d5..9f9e3607 100644 --- a/src/content/yaml.rs +++ b/src/content/yaml.rs @@ -2,10 +2,10 @@ use std::path::Path; use crate::content::{Content, Error}; -use yaml_rust::{yaml::Hash as YamlObj, Yaml as YamlValue}; +use yaml_rust2::{yaml::Hash as YamlObj, Yaml as YamlValue}; pub fn parse_str(s: &str, filename: &Path) -> Result { - let mut blobs = yaml_rust::YamlLoader::load_from_str(s) + let mut blobs = yaml_rust2::YamlLoader::load_from_str(s) .map_err(|_| Error::FailedParsingYaml(filename.to_path_buf()))?; match (blobs.pop(), blobs.pop()) { @@ -48,7 +48,7 @@ pub fn to_string(content: &Content) -> String { let yaml_blob = to_yaml_value(content); let mut buf = String::new(); - let mut emitter = yaml_rust::YamlEmitter::new(&mut buf); + let mut emitter = yaml_rust2::YamlEmitter::new(&mut buf); emitter.dump(&yaml_blob).unwrap(); if !buf.ends_with('\n') { diff --git a/src/env.rs b/src/env.rs index 8d3eaea4..ccd9c894 100644 --- a/src/env.rs +++ b/src/env.rs @@ -394,7 +394,7 @@ pub fn get_cargo_workspace(manifest_dir: &str) -> Arc { .output() .unwrap(); let docs = - yaml_rust::YamlLoader::load_from_str(std::str::from_utf8(&output.stdout).unwrap()) + yaml_rust2::YamlLoader::load_from_str(std::str::from_utf8(&output.stdout).unwrap()) .unwrap(); let manifest = docs.first().expect("Unable to parse cargo manifest"); let workspace_root = PathBuf::from(manifest["workspace_root"].as_str().unwrap());