diff --git a/Cargo.lock b/Cargo.lock index df2105a029..be761a0715 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,13 +153,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36a698e449024a5d18994a815998bf5e2e4bc1883e35a7d7ba95b6b69ee45907" dependencies = [ "cfg-if", - "core-foundation", + "core-foundation 0.6.4", "lazycell", "libc", "mach 0.2.3", "nix 0.15.0", "num-traits 0.2.10", - "uom 0.26.0", + "uom", "winapi 0.3.8", ] @@ -418,7 +418,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.6.2", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", "libc", ] @@ -428,6 +438,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + [[package]] name = "crc32fast" version = "1.2.0" @@ -906,6 +922,31 @@ version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +[[package]] +name = "futures" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-channel-preview" version = "0.3.0-alpha.19" @@ -928,6 +969,17 @@ version = "0.3.0-alpha.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" +[[package]] +name = "futures-executor" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-executor-preview" version = "0.3.0-alpha.19" @@ -939,6 +991,12 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "futures-io" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" + [[package]] name = "futures-io-preview" version = "0.3.0-alpha.19" @@ -971,6 +1029,12 @@ dependencies = [ "futures-util-preview", ] +[[package]] +name = "futures-sink" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" + [[package]] name = "futures-sink-preview" version = "0.3.0-alpha.19" @@ -995,13 +1059,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" dependencies = [ + "futures 0.1.29", + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-utils", "proc-macro-hack", "proc-macro-nested", "slab", + "tokio-io", ] [[package]] @@ -1010,7 +1080,7 @@ version = "0.3.0-alpha.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" dependencies = [ - "futures", + "futures 0.1.29", "futures-channel-preview", "futures-core-preview", "futures-io-preview", @@ -1104,9 +1174,9 @@ dependencies = [ [[package]] name = "heim" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de848466ae9659d5ab634615bdd0b7d558a41ae524ee4d59c880d12499af5b77" +checksum = "28f11cfed41a4703f8f56ccbe411073c52bd3996d92e3ccac90d36bd0e86e0eb" dependencies = [ "heim-common", "heim-cpu", @@ -1123,28 +1193,28 @@ dependencies = [ [[package]] name = "heim-common" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f408c31e695732096a0383df16cd3efee4adb32ba3ad086fb85a7dc8f53100" +checksum = "f97d185137ab6437750cb22a115d4c64027620d48c57893d31720abcba42c388" dependencies = [ "cfg-if", - "core-foundation", - "futures-core-preview", - "futures-util-preview", + "core-foundation 0.7.0", + "futures-core", + "futures-util", "lazy_static 1.4.0", "libc", "mach 0.3.2", - "nix 0.15.0", + "nix 0.16.0", "pin-utils", - "uom 0.25.0", + "uom", "winapi 0.3.8", ] [[package]] name = "heim-cpu" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5785004dfdbd68a814d504b27b8ddc16c748a856835dfb6e65b15142090664ef" +checksum = "328091d34621a28af550523e1c139749fa4bc4590a8ea91b160a0f4b82dd8b06" dependencies = [ "cfg-if", "heim-common", @@ -1158,9 +1228,9 @@ dependencies = [ [[package]] name = "heim-derive" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9573bedf4673c1b254bce7f1521559329d2b27995b693b695fa13be2b15c188b" +checksum = "dc97d9bf8ca9af8a02a533acea548756f23d4759474a1df8e79eb2b57f3cf7ac" dependencies = [ "proc-macro2", "quote", @@ -1169,13 +1239,13 @@ dependencies = [ [[package]] name = "heim-disk" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84980e62564828ae4ca70a8bfbdb0f139cc89abb6c91b8b4809518346a72366" +checksum = "82179359c7b215ae46fe8ac0f9015b8e5dfd6368cd0d113f261b28cb8993713f" dependencies = [ "bitflags", "cfg-if", - "core-foundation", + "core-foundation 0.7.0", "heim-common", "heim-derive", "heim-runtime", @@ -1187,9 +1257,9 @@ dependencies = [ [[package]] name = "heim-host" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de019d5969f6bab766311be378788bd1bb068b59c4f3861c539a420fc258ed3" +checksum = "64b9c8c5f7d1479102a503e3f233241bfb819bf916f02b15e10ba5fbfee7a7f3" dependencies = [ "cfg-if", "heim-common", @@ -1204,9 +1274,9 @@ dependencies = [ [[package]] name = "heim-memory" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cdbe6433197da8387dcd0cf1afd9184db4385d55f8a76355b28ceabe99cdc5" +checksum = "d04e9e068b57049062622cf4a182a45f320459e266c39dfc52ca65fc8c178e3a" dependencies = [ "cfg-if", "heim-common", @@ -1220,9 +1290,9 @@ dependencies = [ [[package]] name = "heim-net" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0f5e590eb2f8b23229ff4b06f7e7aee0e229837d3697f362014343682ae073" +checksum = "4c6323430ecae9b74378b37d0078768989c98b570daacec1d899737d90d72a5b" dependencies = [ "bitflags", "cfg-if", @@ -1232,14 +1302,14 @@ dependencies = [ "hex 0.4.0", "libc", "macaddr", - "nix 0.15.0", + "nix 0.16.0", ] [[package]] name = "heim-process" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64874316339b9c0c7953e7a87d2b32e2400bf6778650ac11b76b05d3c37e121" +checksum = "b20a58b335dc9837088b2c9290822b55c661071cb542f0002e62ed18e8464379" dependencies = [ "cfg-if", "darwin-libproc", @@ -1260,12 +1330,12 @@ dependencies = [ [[package]] name = "heim-runtime" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13ef10b5ab5a501e6537b1414db0e3c488425d88bb131bd4e9ff7c0e61e5fbd1" +checksum = "f87591c7b202868445a7da04b3d8f987b0672dd68c3d66e24fe8f759171dd612" dependencies = [ "cfg-if", - "futures-channel-preview", + "futures-channel", "heim-common", "lazy_static 1.4.0", "threadpool", @@ -1273,9 +1343,9 @@ dependencies = [ [[package]] name = "heim-sensors" -version = "0.0.3" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad8b3c9032bca1a76dd43e1eb5c8044e0c505343cb21949dc7acd1bc55b408b" +checksum = "6f663425e6ed38a6356ee5751a2ebae421f7449fd0507b7e698c7e1e9fabee0c" dependencies = [ "cfg-if", "heim-common", @@ -1285,9 +1355,9 @@ dependencies = [ [[package]] name = "heim-virt" -version = "0.0.8" +version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2dda5314da10a8fbcdf130c065abc65f02c3ace72c6f143ad4537520536e2b" +checksum = "7dd975e9ca42170c0f65102b867e69c3d060027f9bb02fb29cc554f7a0e5680b" dependencies = [ "cfg-if", "heim-common", @@ -1780,6 +1850,19 @@ dependencies = [ "void", ] +[[package]] +name = "nix" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a8300bf427d432716764070ff70d5b2b7801c958b9049686e6cbd8b06fad92" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "void", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -2090,7 +2173,7 @@ dependencies = [ name = "nu_plugin_ps" version = "0.1.0" dependencies = [ - "futures-preview", + "futures 0.3.1", "futures-timer", "heim", "nu-build", @@ -2105,7 +2188,7 @@ name = "nu_plugin_sys" version = "0.1.0" dependencies = [ "battery", - "futures-preview", + "futures 0.3.1", "futures-timer", "heim", "nu-build", @@ -2908,9 +2991,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45af0182ff64abaeea290235eb67da3825a576c5d53e642c4d5b652e12e6effc" +checksum = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae" dependencies = [ "serde 1.0.103", ] @@ -2939,9 +3022,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043" +checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" dependencies = [ "indexmap", "itoa", @@ -3041,9 +3124,9 @@ checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" [[package]] name = "starship" -version = "0.26.5" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f894d024732efa305ffd2cfd20b770de9c2ba5128329d282c30d14d7c4a2f146" +checksum = "0dd67e008b36f43c4dfb7663ead636e61a8db941be37459bf55a3c849aefacae" dependencies = [ "ansi_term 0.12.1", "battery", @@ -3290,7 +3373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" dependencies = [ "bytes", - "futures", + "futures 0.1.29", "log", ] @@ -3408,23 +3491,13 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -[[package]] -name = "uom" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3198c29f199fa8a23d732f4aa21ddc4f4d0a257cb0c2a44afea30145ce2575c1" -dependencies = [ - "num-rational", - "num-traits 0.2.10", - "typenum", -] - [[package]] name = "uom" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cec796ec5f7ac557631709079168286056205c51c60aac33f51764bdc7b8dc4" dependencies = [ + "num-rational", "num-traits 0.2.10", "typenum", ] @@ -3544,7 +3617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c" dependencies = [ "cfg-if", - "futures", + "futures 0.1.29", "futures-channel-preview", "futures-util-preview", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 0be4a0a5e0..7899bcb61c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,10 +44,10 @@ nu_plugin_sys = {version = "0.1.0", path = "./crates/nu_plugin_sys", optional=tr query_interface = "0.3.5" typetag = "0.1.4" rustyline = "5.0.4" -chrono = { version = "0.4.9", features = ["serde"] } +chrono = { version = "0.4.10", features = ["serde"] } derive-new = "0.5.8" prettytable-rs = "0.8.0" -itertools = "0.8.1" +itertools = "0.8.2" ansi_term = "0.12.1" nom = "5.0.1" dunce = "1.0.0" @@ -58,28 +58,28 @@ base64 = "0.11" futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] } async-stream = "0.1.2" futures_codec = "0.2.5" -num-traits = "0.2.8" +num-traits = "0.2.10" term = "0.5.2" bytes = "0.4.12" log = "0.4.8" pretty_env_logger = "0.3.1" -serde = { version = "1.0.102", features = ["derive"] } +serde = { version = "1.0.103", features = ["derive"] } bson = { version = "0.14.0", features = ["decimal128"] } -serde_json = "1.0.41" +serde_json = "1.0.44" serde-hjson = "0.9.1" serde_yaml = "0.8" -serde_bytes = "0.11.2" +serde_bytes = "0.11.3" getset = "0.0.9" language-reporting = "0.4.0" app_dirs = "1.2.1" csv = "1.1" toml = "0.5.5" clap = "2.33.0" -git2 = { version = "0.10.1", default_features = false } +git2 = { version = "0.10.2", default_features = false } dirs = "2.0.2" glob = "0.3.0" ctrlc = "3.1.3" -roxmltree = "0.7.2" +roxmltree = "0.7.3" nom_locate = "1.0.0" nom-tracable = "0.4.1" unicode-xid = "0.2.0" @@ -103,12 +103,12 @@ cfg-if = "0.1" strip-ansi-escapes = "0.1.0" calamine = "0.16" umask = "0.1" -futures-util = "0.3.0" +futures-util = "0.3.1" termcolor = "1.0.5" clipboard = {version = "0.5", optional = true } ptree = {version = "0.2" } -starship = { version = "0.26.4", optional = true} +starship = { version = "0.28", optional = true} [features] default = ["sys", "ps"] diff --git a/crates/nu-build/Cargo.toml b/crates/nu-build/Cargo.toml index c9d2baf317..7759e47ac9 100644 --- a/crates/nu-build/Cargo.toml +++ b/crates/nu-build/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = { version = "1.0.102", features = ["derive"] } -lazy_static = "1.2.0" -serde_json = "1.0.35" +serde = { version = "1.0.103", features = ["derive"] } +lazy_static = "1.4.0" +serde_json = "1.0.44" toml = "0.5.5" diff --git a/crates/nu-errors/Cargo.toml b/crates/nu-errors/Cargo.toml index fc4c723464..6faf46fee6 100644 --- a/crates/nu-errors/Cargo.toml +++ b/crates/nu-errors/Cargo.toml @@ -14,8 +14,8 @@ bigdecimal = { version = "0.1.0", features = ["serde"] } derive-new = "0.5.8" language-reporting = "0.4.0" num-bigint = { version = "0.2.3", features = ["serde"] } -num-traits = "0.2.8" -serde = { version = "1.0.102", features = ["derive"] } +num-traits = "0.2.10" +serde = { version = "1.0.103", features = ["derive"] } nom = "5.0.1" nom_locate = "1.0.0" @@ -23,7 +23,7 @@ nom_locate = "1.0.0" subprocess = "0.1.18" serde_yaml = "0.8" toml = "0.5.5" -serde_json = "1.0.41" +serde_json = "1.0.44" [build-dependencies] nu-build = { version = "0.1.0", path = "../nu-build" } diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 2851ef3f1d..7528ecd9d0 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -10,13 +10,13 @@ edition = "2018" nu-source = { path = "../nu-source" } nu-errors = { path = "../nu-errors" } -serde = { version = "1.0.102", features = ["derive"] } +serde = { version = "1.0.103", features = ["derive"] } indexmap = { version = "1.3.0", features = ["serde-1"] } num-bigint = { version = "0.2.3", features = ["serde"] } bigdecimal = { version = "0.1.0", features = ["serde"] } -chrono = { version = "0.4.9", features = ["serde"] } +chrono = { version = "0.4.10", features = ["serde"] } num-traits = "0.2.8" -serde_bytes = "0.11.2" +serde_bytes = "0.11.3" getset = "0.0.9" derive-new = "0.5.8" ansi_term = "0.12.1" @@ -31,7 +31,7 @@ query_interface = "0.3.5" subprocess = "0.1.18" serde_yaml = "0.8" toml = "0.5.5" -serde_json = "1.0.41" +serde_json = "1.0.44" [build-dependencies] nu-build = { version = "0.1.0", path = "../nu-build" } diff --git a/crates/nu-source/Cargo.toml b/crates/nu-source/Cargo.toml index 3eb0f59f23..2613a82145 100644 --- a/crates/nu-source/Cargo.toml +++ b/crates/nu-source/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" [dependencies] -serde = { version = "1.0.102", features = ["derive"] } +serde = { version = "1.0.103", features = ["derive"] } derive-new = "0.5.8" getset = "0.0.9" nom_locate = "1.0.0" diff --git a/crates/nu_plugin_binaryview/Cargo.toml b/crates/nu_plugin_binaryview/Cargo.toml index d704fdcb2e..c2f48c35f2 100644 --- a/crates/nu_plugin_binaryview/Cargo.toml +++ b/crates/nu_plugin_binaryview/Cargo.toml @@ -13,7 +13,7 @@ nu-protocol = { path = "../nu-protocol" } nu-source = { path = "../nu-source" } nu-errors = { path = "../nu-errors" } pretty-hex = "0.1.1" -image = { version = "0.22.2", default_features = false, features = ["png_codec", "jpeg"] } +image = { version = "0.22.3", default_features = false, features = ["png_codec", "jpeg"] } rawkey = "0.1.2" neso = "0.5.0" diff --git a/crates/nu_plugin_post/Cargo.toml b/crates/nu_plugin_post/Cargo.toml index d615c74930..5c0dc1e732 100644 --- a/crates/nu_plugin_post/Cargo.toml +++ b/crates/nu_plugin_post/Cargo.toml @@ -13,9 +13,9 @@ nu-errors = { path = "../nu-errors" } futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] } surf = "1.0.3" url = "2.1.0" -serde_json = "1.0.41" +serde_json = "1.0.44" base64 = "0.11" -num-traits = "0.2.8" +num-traits = "0.2.10" [build-dependencies] nu-build = { version = "0.1.0", path = "../nu-build" } diff --git a/crates/nu_plugin_ps/Cargo.toml b/crates/nu_plugin_ps/Cargo.toml index d21db319b5..c9ffa7b69f 100644 --- a/crates/nu_plugin_ps/Cargo.toml +++ b/crates/nu_plugin_ps/Cargo.toml @@ -10,9 +10,9 @@ edition = "2018" nu-protocol = { path = "../nu-protocol" } nu-source = { path = "../nu-source" } nu-errors = { path = "../nu-errors" } -futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] } -heim = "0.0.8" -futures-timer = "2.0.0" +futures = { version = "0.3.0", features = ["compat", "io-compat"] } +heim = "0.0.9" +futures-timer = "2.0.2" pin-utils = "0.1.0-alpha.4" [build-dependencies] diff --git a/crates/nu_plugin_sys/Cargo.toml b/crates/nu_plugin_sys/Cargo.toml index caf9a9d47b..4e41f4b443 100644 --- a/crates/nu_plugin_sys/Cargo.toml +++ b/crates/nu_plugin_sys/Cargo.toml @@ -10,11 +10,11 @@ edition = "2018" nu-protocol = { path = "../nu-protocol" } nu-source = { path = "../nu-source" } nu-errors = { path = "../nu-errors" } -futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] } -heim = "0.0.8" -futures-timer = "2.0.0" +futures = { version = "0.3.0", features = ["compat", "io-compat"] } +heim = "0.0.9" +futures-timer = "2.0.2" pin-utils = "0.1.0-alpha.4" -battery = "0.7.4" +battery = "0.7.5" [build-dependencies] nu-build = { version = "0.1.0", path = "../nu-build" }