From 2b181bf69c563c628d21a2957ab1b8057988dd44 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:33:00 -0500 Subject: [PATCH] update ini dependency (#9426) # Description This PR updates the ini dependency. # User-Facing Changes # Tests + Formatting # After Submitting --- Cargo.lock | 54 ++++++++++++++++++++++---- crates/nu-command/tests/commands/cp.rs | 2 +- crates/nu_plugin_formats/Cargo.toml | 2 +- tests/plugins/formats/ini.rs | 2 +- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12d92edcea..ba50f5fb37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,6 +687,28 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.9", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + [[package]] name = "const_format" version = "0.2.30" @@ -874,6 +896,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -1034,9 +1062,12 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +dependencies = [ + "const-random", +] [[package]] name = "doc-comment" @@ -3364,12 +3395,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -4505,9 +4536,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" dependencies = [ "cfg-if 1.0.0", "ordered-multimap", @@ -5298,6 +5329,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/crates/nu-command/tests/commands/cp.rs b/crates/nu-command/tests/commands/cp.rs index f7168e3201..e249210f98 100644 --- a/crates/nu-command/tests/commands/cp.rs +++ b/crates/nu-command/tests/commands/cp.rs @@ -8,7 +8,7 @@ use nu_test_support::playground::Playground; use std::path::Path; fn get_file_hash(file: T) -> String { - nu!("open {} | to text | hash md5", file).out + nu!("open -r {} | to text | hash md5", file).out } #[test] diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml index cf22cdc20c..dc9277aae5 100644 --- a/crates/nu_plugin_formats/Cargo.toml +++ b/crates/nu_plugin_formats/Cargo.toml @@ -15,4 +15,4 @@ nu-protocol = { path = "../nu-protocol", version = "0.81.1", features = ["plugin indexmap = { version = "1.7", features = ["serde-1"] } eml-parser = "0.1" ical = "0.8" -rust-ini = "0.18" +rust-ini = "0.19.0" diff --git a/tests/plugins/formats/ini.rs b/tests/plugins/formats/ini.rs index c6220253b0..bbb2a4cb19 100644 --- a/tests/plugins/formats/ini.rs +++ b/tests/plugins/formats/ini.rs @@ -21,7 +21,7 @@ fn parses_utf16_ini() { let actual = nu_with_plugins!( cwd: TEST_CWD, plugin: ("nu_plugin_formats"), - "open ./utf16.ini --raw | decode utf-16 | from ini | rename info | get info | get IconIndex" + "open ./utf16.ini --raw | decode utf-16 | from ini | get '.ShellClassInfo' | get IconIndex" ); assert_eq!(actual.out, "-236")