From 17a7a85c7853e70460f29edccd7997af7723d435 Mon Sep 17 00:00:00 2001 From: JT <547158+jntrnr@users.noreply.github.com> Date: Thu, 16 Dec 2021 20:40:05 +1100 Subject: [PATCH] Bump some deps (#503) --- Cargo.lock | 142 +++++++++++++++++++---- Cargo.toml | 4 +- crates/nu-command/Cargo.toml | 6 +- crates/nu-command/src/formats/to/html.rs | 6 +- 4 files changed, 126 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e63ba6d685..420003b706 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.8" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" +checksum = "e996dc7940838b7ef1096b882e29ec30a3149a3a443cdc8dba19ed382eca1fe2" dependencies = [ "bstr", "doc-comment", @@ -282,6 +282,15 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-buffer" version = "0.10.0" @@ -487,6 +496,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -684,13 +699,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "digest" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" dependencies = [ - "block-buffer", + "block-buffer 0.10.0", "crypto-common", "generic-array 0.14.4", ] @@ -1320,9 +1344,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.109" +version = "0.2.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" +checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libgit2-sys" @@ -1422,6 +1446,15 @@ dependencies = [ "libc", ] +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "matches" version = "0.1.9" @@ -1434,7 +1467,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" dependencies = [ - "digest", + "digest 0.10.0", ] [[package]] @@ -1647,7 +1680,7 @@ dependencies = [ "crossterm", "csv", "dialoguer", - "digest", + "digest 0.10.0", "dtparse", "eml-parser", "glob", @@ -1680,7 +1713,7 @@ dependencies = [ "serde_ini", "serde_urlencoded", "serde_yaml", - "sha2", + "sha2 0.10.0", "shadow-rs", "strip-ansi-escapes", "sysinfo", @@ -1959,6 +1992,15 @@ dependencies = [ "libc", ] +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + [[package]] name = "object" version = "0.27.1" @@ -1974,6 +2016,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "openssl-probe" version = "0.1.4" @@ -2286,9 +2334,9 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "pretty_assertions" -version = "0.7.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b" +checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc" dependencies = [ "ansi_term", "ctor", @@ -2538,9 +2586,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "5.9.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" +checksum = "d40377bff8cceee81e28ddb73ac97f5c2856ce5522f0b260b763f434cdfae602" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2549,9 +2597,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "5.9.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" +checksum = "94e763e24ba2bf0c72bc6be883f967f794a019fafd1b86ba1daff9c91a7edd30" dependencies = [ "proc-macro2", "quote", @@ -2562,10 +2610,11 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "5.1.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" +checksum = "ad22c7226e4829104deab21df575e995bfbc4adfad13a595e387477f238c1aec" dependencies = [ + "sha2 0.9.8", "walkdir", ] @@ -2702,6 +2751,19 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "sha2" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + [[package]] name = "sha2" version = "0.10.0" @@ -2710,7 +2772,7 @@ checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.0", ] [[package]] @@ -2896,9 +2958,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f88d66f3341b688163d3585037954ff276cf24a234d015b30025318a3e3449a" +checksum = "7c8591205e26661d45f9b31300599b133328c7e0f57e552a7be8d3b3c5748470" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3038,11 +3100,17 @@ dependencies = [ [[package]] name = "trash" -version = "1.3.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90df96afb154814e214f37eac04920c66886fd95962f22febb4d537b0dacd512" +checksum = "d3ebb6cb2db7947ab9f65dec9f7c5dbe01042b708f564242dcfb6d5cb2957cbc" dependencies = [ - "winapi", + "chrono", + "libc", + "log", + "objc", + "scopeguard", + "url", + "windows", ] [[package]] @@ -3343,6 +3411,36 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361f3533a83ee1a28c9be59683f40043db02dbedf6479ce8795657386195c97f" +dependencies = [ + "const-sha1", + "windows_gen", + "windows_macros", +] + +[[package]] +name = "windows_gen" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54154dbc515d58723f6b6053c12f1065da7389f733660581b2391bd1af480452" +dependencies = [ + "syn", +] + +[[package]] +name = "windows_macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f7794c652845dc466cb8dc1b86c08345707c8144bc53e9086430047c7d33b76" +dependencies = [ + "syn", + "windows_gen", +] + [[package]] name = "xmlparser" version = "0.13.3" diff --git a/Cargo.toml b/Cargo.toml index 661abecaed..53456d9c90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,8 @@ nu_plugin_gstat = { version = "0.1.0", path = "./crates/nu_plugin_gstat", option [dev-dependencies] tempfile = "3.2.0" -assert_cmd = "1.0.7" -pretty_assertions = "0.7.2" +assert_cmd = "2.0.2" +pretty_assertions = "1.0.0" [build-dependencies] diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index 166895d068..2093034376 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -23,7 +23,7 @@ csv = "1.1.3" glob = "0.3.0" Inflector = "0.11" thiserror = "1.0.29" -sysinfo = "0.21.2" +sysinfo = "0.22.2" chrono = { version = "0.4.19", features = ["serde"] } chrono-humanize = "0.2.1" chrono-tz = "0.6.0" @@ -48,8 +48,8 @@ ical = "0.7.0" calamine = "0.18.0" roxmltree = "0.14.0" rand = "0.8" -rust-embed = "5.9.0" -trash = { version = "1.3.0", optional = true } +rust-embed = "6.3.0" +trash = { version = "2.0.2", optional = true } unicode-segmentation = "1.8.0" uuid = { version = "0.8.2", features = ["v4"] } htmlescape = "0.3.1" diff --git a/crates/nu-command/src/formats/to/html.rs b/crates/nu-command/src/formats/to/html.rs index ec19cec2e3..1a69bb37fc 100644 --- a/crates/nu-command/src/formats/to/html.rs +++ b/crates/nu-command/src/formats/to/html.rs @@ -9,7 +9,6 @@ use nu_protocol::{ use regex::Regex; use rust_embed::RustEmbed; use serde::{Deserialize, Serialize}; -use std::borrow::Cow; use std::collections::HashMap; use std::error::Error; use std::fmt::Write; @@ -207,10 +206,7 @@ fn get_asset_by_name_as_html_themes( ) -> Result> { match Assets::get(zip_name) { Some(content) => { - let asset: Vec = match content { - Cow::Borrowed(bytes) => bytes.into(), - Cow::Owned(bytes) => bytes, - }; + let asset: Vec = content.data.into(); let reader = std::io::Cursor::new(asset); #[cfg(feature = "zip")] {