From 8f93d2f464b04b08b7972fc7a48f3b48eee294fe Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 1 Dec 2022 22:38:01 -0800 Subject: [PATCH] deps: toml_edit 0.3 --- Cargo.lock | 200 ++++++++++++++++++++-------------------------------- Cargo.toml | 2 +- src/main.rs | 4 +- 3 files changed, 80 insertions(+), 126 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6e5d82..5a210a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,12 +20,6 @@ dependencies = [ "nodrop", ] -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "atty" version = "0.2.13" @@ -38,9 +32,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.6" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" @@ -71,16 +65,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" [[package]] -name = "byteorder" -version = "1.3.2" +name = "bytes" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cc" -version = "1.0.41" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -88,18 +82,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -[[package]] -name = "chrono" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", -] - [[package]] name = "clap" version = "2.33.0" @@ -117,22 +99,19 @@ dependencies = [ [[package]] name = "combine" -version = "3.8.1" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "ascii", - "byteorder", - "either", + "bytes", "memchr", - "unreachable", ] [[package]] name = "either" -version = "1.5.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "failure" @@ -156,6 +135,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "heck" version = "0.3.1" @@ -165,6 +150,25 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.4" @@ -186,21 +190,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.62" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" - -[[package]] -name = "linked-hash-map" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "memchr" -version = "2.2.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "nodrop" @@ -219,34 +217,15 @@ dependencies = [ "version_check", ] -[[package]] -name = "num-integer" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -dependencies = [ - "autocfg", -] - [[package]] name = "proc-macro-error" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d281dfa5bd274bc29812b094477649bae12ef57e93575b52c0e10d0b94c09" dependencies = [ - "proc-macro2 1.0.2", - "quote 1.0.2", - "syn 1.0.5", + "proc-macro2 1.0.47", + "quote 1.0.21", + "syn 1.0.105", ] [[package]] @@ -255,16 +234,16 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ - "unicode-xid 0.1.0", + "unicode-xid", ] [[package]] name = "proc-macro2" -version = "1.0.2" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "unicode-xid 0.2.0", + "unicode-ident", ] [[package]] @@ -278,19 +257,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.2" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ - "proc-macro2 1.0.2", + "proc-macro2 1.0.47", ] -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - [[package]] name = "rustc-demangle" version = "0.1.16" @@ -374,9 +347,9 @@ checksum = "2558075232402034384db060831349fb2d1303479593177cc84c25febbebbc6d" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.2", - "quote 1.0.2", - "syn 1.0.5", + "proc-macro2 1.0.47", + "quote 1.0.21", + "syn 1.0.105", ] [[package]] @@ -387,18 +360,18 @@ checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", - "unicode-xid 0.1.0", + "unicode-xid", ] [[package]] name = "syn" -version = "1.0.5" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ - "proc-macro2 1.0.2", - "quote 1.0.2", - "unicode-xid 0.2.0", + "proc-macro2 1.0.47", + "quote 1.0.21", + "unicode-ident", ] [[package]] @@ -410,7 +383,7 @@ dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", "syn 0.15.44", - "unicode-xid 0.1.0", + "unicode-xid", ] [[package]] @@ -422,17 +395,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "time" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -dependencies = [ - "libc", - "redox_syscall", - "winapi", -] - [[package]] name = "toml-cli" version = "0.2.0" @@ -447,15 +409,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f53b1aca7d5fe2e17498a38cac0e1f5a33234d5b980fb36b9402bb93b98ae4" +checksum = "1d30834716e93eef7db510648299f647427858e7e2c0beeec2699ea2289c7739" dependencies = [ - "chrono", "combine", - "linked-hash-map", + "indexmap", + "itertools", + "vec1", ] +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + [[package]] name = "unicode-segmentation" version = "1.3.0" @@ -475,19 +444,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] -name = "unicode-xid" -version = "0.2.0" +name = "vec1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] +checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" [[package]] name = "vec_map" @@ -501,17 +461,11 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", diff --git a/Cargo.toml b/Cargo.toml index f003aaa..774036b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,4 +23,4 @@ nom = "5" serde = "1.0" serde_json = "1.0" structopt = "0.3" -toml_edit = "0.1" +toml_edit = "0.3" diff --git a/src/main.rs b/src/main.rs index 1c644fa..1c2f318 100644 --- a/src/main.rs +++ b/src/main.rs @@ -117,7 +117,7 @@ fn print_toml_fragment(doc: &Document, tpath: &[TpathSegment]) -> () { let mut next = a.clone(); next.clear(); match item { - Item::Table(t) => { next.append(t); }, + Item::Table(t) => { next.push(t); }, _ => panic!("malformed TOML parse-tree"), } item = Item::ArrayOfTables(next); @@ -243,7 +243,7 @@ impl Serialize for JsonValue<'_> { v.serialize(serializer) } else if let Some(v) = self.0.as_str() { v.serialize(serializer) - } else if let Some(_) = self.0.as_date_time() { + } else if let Some(_) = self.0.as_datetime() { "UNIMPLEMENTED: DateTime".serialize(serializer) // TODO } else if let Some(arr) = self.0.as_array() { let mut seq = serializer.serialize_seq(Some(arr.len()))?;