diff --git a/Cargo.lock b/Cargo.lock index 851dff8561..a2b5a8c392 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,16 +204,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-dup" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" -dependencies = [ - "futures-io", - "simple-mutex", -] - [[package]] name = "async-executor" version = "1.4.0" @@ -242,24 +232,7 @@ dependencies = [ "futures-lite", "num_cpus", "once_cell", -] - -[[package]] -name = "async-h1" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9e2a9745d9cd0d92ed7641ce4d07568985762f92633260f0afe8ac7917d9d7" -dependencies = [ - "async-channel", - "async-dup", - "async-std", - "byte-pool", - "futures-core", - "http-types", - "httparse", - "lazy_static 1.4.0", - "log 0.4.14", - "pin-project 1.0.4", + "tokio 0.2.24", ] [[package]] @@ -345,19 +318,6 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" -[[package]] -name = "async-tls" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52" -dependencies = [ - "futures-core", - "futures-io", - "rustls", - "webpki", - "webpki-roots", -] - [[package]] name = "async-trait" version = "0.1.42" @@ -602,16 +562,6 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" -[[package]] -name = "byte-pool" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38e98299d518ec351ca016363e0cbfc77059dcd08dfa9700d15e405536097a" -dependencies = [ - "crossbeam-queue 0.2.3", - "stable_deref_trait", -] - [[package]] name = "byte-tools" version = "0.2.0" @@ -1045,16 +995,6 @@ dependencies = [ "maybe-uninit", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", -] - [[package]] name = "crossbeam-utils" version = "0.6.6" @@ -1282,20 +1222,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" -[[package]] -name = "deadpool" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" -dependencies = [ - "async-trait", - "config", - "crossbeam-queue 0.3.1", - "num_cpus", - "serde 1.0.123", - "tokio 1.2.0", -] - [[package]] name = "decimal" version = "2.0.4" @@ -2331,15 +2257,14 @@ version = "6.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34" dependencies = [ - "async-h1", "async-std", - "async-tls", "async-trait", "cfg-if 1.0.0", "dashmap", - "deadpool", - "futures 0.3.12", + "futures-util", "http-types", + "hyper 0.13.9", + "hyper-tls", "isahc 0.9.14", "log 0.4.14", ] @@ -2356,6 +2281,7 @@ dependencies = [ "base64 0.13.0", "cookie", "futures-lite", + "http 0.2.3", "infer", "pin-project-lite 0.2.4", "rand 0.7.3", @@ -4930,21 +4856,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560" -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "roxmltree" version = "0.14.0" @@ -5066,19 +4977,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log 0.4.14", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustversion" version = "1.0.4" @@ -5209,16 +5107,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "2.0.0" @@ -5557,15 +5445,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simple-mutex" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" -dependencies = [ - "event-listener", -] - [[package]] name = "siphasher" version = "0.3.3" @@ -5649,12 +5528,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spinning_top" version = "0.2.2" @@ -6201,16 +6074,6 @@ dependencies = [ "tokio-macros", ] -[[package]] -name = "tokio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" -dependencies = [ - "autocfg", - "pin-project-lite 0.2.4", -] - [[package]] name = "tokio-codec" version = "0.1.2" @@ -6371,7 +6234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque 0.7.3", - "crossbeam-queue 0.2.3", + "crossbeam-queue", "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static 1.4.0", @@ -6633,12 +6496,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "2.2.1" @@ -6903,25 +6760,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki", -] - [[package]] name = "weezl" version = "0.1.3" diff --git a/crates/nu_plugin_fetch/Cargo.toml b/crates/nu_plugin_fetch/Cargo.toml index ddb62e9e49..8c112e37c1 100644 --- a/crates/nu_plugin_fetch/Cargo.toml +++ b/crates/nu_plugin_fetch/Cargo.toml @@ -16,7 +16,7 @@ nu-errors = { path = "../nu-errors", version = "0.28.0" } nu-plugin = { path = "../nu-plugin", version = "0.28.0" } nu-protocol = { path = "../nu-protocol", version = "0.28.0" } nu-source = { path = "../nu-source", version = "0.28.0" } -surf = { version = "2.2.0", features = ["h1-client-rustls"] } +surf = { version = "2.2.0", features = ["hyper-client"] } url = "2.2.1" mime = "0.3.16"