diff --git a/Cargo.lock b/Cargo.lock index 36790d68a3..cd905b4bc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "attohttpc" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" +checksum = "d5db1932a9d70d5091139d6b0e04ec6a4d9f9184041c15d71a5ef954cb3c5312" dependencies = [ "http 0.2.1", "log", @@ -302,6 +302,27 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + [[package]] name = "bson" version = "0.14.1" @@ -339,6 +360,12 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5356f1d23ee24a1f785a56d1d1a5f0fd5b0f6a0c0fb2412ce11da71649ab78f6" +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + [[package]] name = "byte-unit" version = "3.0.3" @@ -753,6 +780,15 @@ dependencies = [ "syn", ] +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array", +] + [[package]] name = "directories" version = "1.0.2" @@ -898,6 +934,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1181,6 +1223,15 @@ dependencies = [ "pin-project", ] +[[package]] +name = "generic-array" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ + "typenum", +] + [[package]] name = "gethostname" version = "0.2.1" @@ -1756,9 +1807,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d90181c2904c287e5390186be820e5ef311a3c62edebb7d6ca3d6a48ce041d" +checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd" dependencies = [ "cc", "pkg-config", @@ -1862,6 +1913,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "matches" version = "0.1.8" @@ -2663,6 +2720,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + [[package]] name = "open" version = "1.4.0" @@ -2767,6 +2830,49 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +dependencies = [ + "maplit", + "pest", + "sha-1", +] + [[package]] name = "petgraph" version = "0.4.13" @@ -3182,18 +3288,18 @@ checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560" [[package]] name = "roxmltree" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4129743af505f674602b97d02c8ebe526752de8811e21ecb2fb166fcf4afe157" +checksum = "d5001f134077069d87f77c8b9452b690df2445f7a43f1c7ca4a1af8dd505789d" dependencies = [ "xmlparser", ] [[package]] name = "rusqlite" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57edf4c4cea4d7e0fab069acb5da9e8e8e5403c78abc81b1f37d83af02148ea5" +checksum = "45d0fd62e1df63d254714e6cb40d0a0e82e7a1623e7a27f679d851af092ae58b" dependencies = [ "bitflags", "fallible-iterator", @@ -3201,6 +3307,7 @@ dependencies = [ "libsqlite3-sys", "lru-cache", "memchr", + "smallvec", "time", ] @@ -3468,6 +3575,18 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "sha-1" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +dependencies = [ + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", +] + [[package]] name = "shell32-sys" version = "0.1.2" @@ -3545,9 +3664,9 @@ dependencies = [ [[package]] name = "starship" -version = "0.39.0" +version = "0.41.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "596bca871e5a61006c78fb59ca7a03ee822ab7d91f65af8e3d8492ece9ae7df1" +checksum = "891dec63d2b8ffed3d2388c0449dbd939f6da1b26747ba0ed1a01e4d47f32fce" dependencies = [ "ansi_term 0.12.1", "attohttpc", @@ -3564,6 +3683,8 @@ dependencies = [ "open", "os_info", "path-slash", + "pest", + "pest_derive", "pretty_env_logger", "rayon", "regex", @@ -3691,9 +3812,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.12.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccb41798287e8e299a701b5560d886d6ca2c3e7115e9ea2cb68c123aec339b7" +checksum = "70bbf8e10fc10b83e71bc19f4374ce17209d45c7c4c99b5067ac554aba3bfd08" dependencies = [ "cfg-if", "doc-comment", @@ -3841,14 +3962,15 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" dependencies = [ + "indexmap", "serde 1.0.110", ] [[package]] name = "trash" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f24d31505f49e989b1ee2c03c323251f6763d5907d471b71192dac92e323f8" +checksum = "a3d3efa66f2eb71069c3ba9582361e823626067b728ec882490e68c9c43b5e32" dependencies = [ "winapi 0.3.8", ] @@ -3889,6 +4011,12 @@ dependencies = [ "syn", ] +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "umask" version = "0.1.8" diff --git a/Cargo.toml b/Cargo.toml index 7bdb8bfb05..3ec88708c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,12 +39,12 @@ nu_plugin_sys = { version = "0.14.1", path = "./crates/nu_plugin_sys", optional= nu_plugin_textview = { version = "0.14.1", path = "./crates/nu_plugin_textview", optional=true } nu_plugin_tree = { version = "0.14.1", path = "./crates/nu_plugin_tree", optional=true } -crossterm = { version = "0.17.2", optional = true } +crossterm = { version = "0.17.4", optional = true } semver = { version = "0.9.0", optional = true } syntect = { version = "4.1", default-features = false, features = ["default-fancy"], optional = true} url = { version = "2.1.1", optional = true } -clap = "2.33.0" +clap = "2.33.1" ctrlc = "3.1.4" dunce = "1.0.0" futures = { version = "0.3", features = ["compat", "io-compat"] } @@ -56,7 +56,7 @@ nu-test-support = { version = "0.14.1", path = "./crates/nu-test-support" } [build-dependencies] toml = "0.5.6" -serde = { version = "1.0.106", features = ["derive"] } +serde = { version = "1.0.110", features = ["derive"] } nu-build = { version = "0.14.1", path = "./crates/nu-build" } [features] diff --git a/crates/nu-build/Cargo.toml b/crates/nu-build/Cargo.toml index d962b132cc..e9f15cc1d1 100644 --- a/crates/nu-build/Cargo.toml +++ b/crates/nu-build/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" doctest = false [dependencies] -serde = { version = "1.0.106", features = ["derive"] } +serde = { version = "1.0.110", features = ["derive"] } lazy_static = "1.4.0" -serde_json = "1.0.51" +serde_json = "1.0.53" toml = "0.5.6" diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index 5b234d4d71..7f182dcd68 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -24,15 +24,15 @@ app_dirs = "1.2.1" async-recursion = "0.3.1" directories = "2.0.2" async-stream = "0.2" -base64 = "0.12.0" -bigdecimal = { version = "0.1.0", features = ["serde"] } +base64 = "0.12.1" +bigdecimal = { version = "0.1.2", features = ["serde"] } bson = { version = "0.14.1", features = ["decimal128"] } byte-unit = "3.0.3" bytes = "0.5.4" calamine = "0.16" cfg-if = "0.1" chrono = { version = "0.4.11", features = ["serde"] } -clap = "2.33.0" +clap = "2.33.1" csv = "1.1" ctrlc = "3.1.4" derive-new = "0.5.8" @@ -41,10 +41,10 @@ dunce = "1.0.0" eml-parser = "0.1.0" filesize = "0.2.0" futures = { version = "0.3", features = ["compat", "io-compat"] } -futures-util = "0.3.4" +futures-util = "0.3.5" futures_codec = "0.4" -getset = "0.1.0" -git2 = { version = "0.13.1", default_features = false } +getset = "0.1.1" +git2 = { version = "0.13.5", default_features = false } glob = "0.3.0" hex = "0.4" htmlescape = "0.3.1" @@ -58,8 +58,8 @@ meval = "0.2" natural = "0.5.0" num-bigint = { version = "0.2.6", features = ["serde"] } num-traits = "0.2.11" -parking_lot = "0.10.0" -pin-utils = "0.1.0-alpha.4" +parking_lot = "0.10.2" +pin-utils = "0.1.0" pretty-hex = "0.1.1" pretty_env_logger = "0.4.0" prettytable-rs = "0.8.0" @@ -67,13 +67,13 @@ ptree = {version = "0.2" } query_interface = "0.3.5" rand = "0.7" regex = "1" -roxmltree = "0.10.1" +roxmltree = "0.11.0" rustyline = "6.1.2" -serde = { version = "1.0.106", features = ["derive"] } +serde = { version = "1.0.110", features = ["derive"] } serde-hjson = "0.9.1" -serde_bytes = "0.11.3" +serde_bytes = "0.11.4" serde_ini = "0.2.0" -serde_json = "1.0.51" +serde_json = "1.0.53" serde_urlencoded = "0.6.1" serde_yaml = "0.8" shellexpand = "2.0.0" @@ -88,16 +88,16 @@ umask = "0.1" unicode-xid = "0.2.0" which = "3" -trash = { version = "1.0.0", optional = true } +trash = { version = "1.0.1", optional = true } clipboard = { version = "0.5", optional = true } -starship = { version = "0.39.0", optional = true } +starship = { version = "0.41.3", optional = true } rayon = "1.3.0" [target.'cfg(unix)'.dependencies] users = "0.10.0" [dependencies.rusqlite] -version = "0.22.0" +version = "0.23.1" features = ["bundled", "blob"] [build-dependencies] diff --git a/crates/nu-cli/tests/commands/save.rs b/crates/nu-cli/tests/commands/save.rs index be01c18fcb..913e076487 100644 --- a/crates/nu-cli/tests/commands/save.rs +++ b/crates/nu-cli/tests/commands/save.rs @@ -42,6 +42,6 @@ fn writes_out_csv() { ); let actual = file_contents(expected_file); - assert!(actual.contains("[Table],a new type of shell,2018,ISC,nu,0.1.1")); + assert!(actual.contains("nu,0.1.1,[Table],a new type of shell,ISC,2018")); }) } diff --git a/crates/nu-errors/Cargo.toml b/crates/nu-errors/Cargo.toml index b1f886c041..a1bd9ecb43 100644 --- a/crates/nu-errors/Cargo.toml +++ b/crates/nu-errors/Cargo.toml @@ -13,18 +13,18 @@ doctest = false nu-source = { path = "../nu-source", version = "0.14.1" } ansi_term = "0.12.1" -bigdecimal = { version = "0.1.0", features = ["serde"] } +bigdecimal = { version = "0.1.2", features = ["serde"] } derive-new = "0.5.8" language-reporting = "0.4.0" num-bigint = { version = "0.2.6", features = ["serde"] } num-traits = "0.2.11" -serde = { version = "1.0.106", features = ["derive"] } -getset = "0.1.0" +serde = { version = "1.0.110", features = ["derive"] } +getset = "0.1.1" # implement conversions serde_yaml = "0.8" toml = "0.5.6" -serde_json = "1.0.51" +serde_json = "1.0.53" glob = "0.3.0" [build-dependencies] diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml index 1ba0c377a1..1251d30257 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -10,12 +10,12 @@ license = "MIT" [dependencies] num-bigint = { version = "0.2.6", features = ["serde"] } -bigdecimal = { version = "0.1.0", features = ["serde"] } +bigdecimal = { version = "0.1.2", features = ["serde"] } indexmap = { version = "1.3.2", features = ["serde-1"] } -parking_lot = "0.10.0" +parking_lot = "0.10.2" num-traits = "0.2.11" derive-new = "0.5.8" -serde = "1.0.106" +serde = "1.0.110" language-reporting = "0.4.0" log = "0.4.8" shellexpand = "2.0.0" diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml index cc06e63602..22be81eaa0 100644 --- a/crates/nu-plugin/Cargo.toml +++ b/crates/nu-plugin/Cargo.toml @@ -16,9 +16,9 @@ nu-errors = { path = "../nu-errors", version = "0.14.1" } nu-value-ext = { path = "../nu-value-ext", version = "0.14.1" } indexmap = { version = "1.3.2", features = ["serde-1"] } -serde = { version = "1.0.106", features = ["derive"] } +serde = { version = "1.0.110", features = ["derive"] } num-bigint = { version = "0.2.6", features = ["serde"] } -serde_json = "1.0.51" +serde_json = "1.0.53" [build-dependencies] nu-build = { version = "0.14.1", path = "../nu-build" } diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 39f0401d89..fedd1955f0 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -13,14 +13,14 @@ doctest = false nu-source = { path = "../nu-source", version = "0.14.1" } nu-errors = { path = "../nu-errors", version = "0.14.1" } -serde = { version = "1.0.106", features = ["derive"] } +serde = { version = "1.0.110", features = ["derive"] } indexmap = { version = "1.3.2", features = ["serde-1"] } num-bigint = { version = "0.2.6", features = ["serde"] } -bigdecimal = { version = "0.1.0", features = ["serde"] } +bigdecimal = { version = "0.1.2", features = ["serde"] } chrono = { version = "0.4.11", features = ["serde"] } num-traits = "0.2.11" -serde_bytes = "0.11.3" -getset = "0.1.0" +serde_bytes = "0.11.4" +getset = "0.1.1" derive-new = "0.5.8" ansi_term = "0.12.1" language-reporting = "0.4.0" @@ -33,7 +33,7 @@ log = "0.4.8" # implement conversions serde_yaml = "0.8" toml = "0.5.6" -serde_json = "1.0.51" +serde_json = "1.0.53" [build-dependencies] nu-build = { version = "0.14.1", path = "../nu-build" } diff --git a/crates/nu-source/Cargo.toml b/crates/nu-source/Cargo.toml index 039a96d923..47a3bab6e6 100644 --- a/crates/nu-source/Cargo.toml +++ b/crates/nu-source/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] serde = { version = "1.0.106", features = ["derive"] } derive-new = "0.5.8" -getset = "0.1.0" +getset = "0.1.1" language-reporting = "0.4.0" termcolor = "1.1.0" pretty = "0.5.2" diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml index aeb9431c17..bc572931bd 100644 --- a/crates/nu-test-support/Cargo.toml +++ b/crates/nu-test-support/Cargo.toml @@ -16,7 +16,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.14.1" } directories = "2.0.2" dunce = "1.0.0" -getset = "0.1.0" +getset = "0.1.1" glob = "0.3.0" tempfile = "3.1.0" indexmap = { version = "1.3.2", features = ["serde-1"] } diff --git a/crates/nu_plugin_binaryview/Cargo.toml b/crates/nu_plugin_binaryview/Cargo.toml index 9770cd9ce4..aa9dadbc72 100644 --- a/crates/nu_plugin_binaryview/Cargo.toml +++ b/crates/nu_plugin_binaryview/Cargo.toml @@ -11,7 +11,7 @@ doctest = false [dependencies] ansi_term = "0.12.1" -crossterm = { version = "0.17.2" } +crossterm = { version = "0.17.4" } nu-plugin = { path = "../nu-plugin", version = "0.14.1" } nu-protocol = { path = "../nu-protocol", version = "0.14.1" } nu-source = { path = "../nu-source", version = "0.14.1" } diff --git a/crates/nu_plugin_post/Cargo.toml b/crates/nu_plugin_post/Cargo.toml index 69b14ab885..dc014da1d5 100644 --- a/crates/nu_plugin_post/Cargo.toml +++ b/crates/nu_plugin_post/Cargo.toml @@ -17,8 +17,8 @@ nu-errors = { path = "../nu-errors", version = "0.14.1" } futures = { version = "0.3", features = ["compat", "io-compat"] } surf = "1.0.3" url = "2.1.1" -serde_json = "1.0.51" -base64 = "0.12.0" +serde_json = "1.0.53" +base64 = "0.12.1" num-traits = "0.2.11" [build-dependencies] diff --git a/crates/nu_plugin_sys/Cargo.toml b/crates/nu_plugin_sys/Cargo.toml index d2591cdd57..e4578b72fa 100644 --- a/crates/nu_plugin_sys/Cargo.toml +++ b/crates/nu_plugin_sys/Cargo.toml @@ -17,7 +17,7 @@ nu-errors = { path = "../nu-errors", version = "0.14.1" } futures = { version = "0.3", features = ["compat", "io-compat"] } battery = "0.7.5" -futures-util = "0.3.4" +futures-util = "0.3.5" [dependencies.heim] version = "0.0.10" diff --git a/crates/nu_plugin_textview/Cargo.toml b/crates/nu_plugin_textview/Cargo.toml index 44d6a089cc..237ff58695 100644 --- a/crates/nu_plugin_textview/Cargo.toml +++ b/crates/nu_plugin_textview/Cargo.toml @@ -15,7 +15,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.14.1" } nu-source = { path = "../nu-source", version = "0.14.1" } nu-errors = { path = "../nu-errors", version = "0.14.1" } -crossterm = "0.17.2" +crossterm = "0.17.4" syntect = { version = "4.1", default-features = false, features = ["default-fancy"]} ansi_term = "0.12.1" url = "2.1.1"