Revert "Unify use of the surf crate (#3777)" (#3783)

This reverts commit 37612345f2.
This commit is contained in:
Darren Schroeder 2021-07-14 20:21:18 -05:00 committed by GitHub
parent 3645a0f0e4
commit 181ee1dade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 113 additions and 2 deletions

111
Cargo.lock generated
View file

@ -1155,6 +1155,37 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7313c0d620d0cb4dbd9d019e461a4beb501071ff46ec0ab933efb4daa76d73e3" checksum = "7313c0d620d0cb4dbd9d019e461a4beb501071ff46ec0ab933efb4daa76d73e3"
[[package]]
name = "curl"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515"
dependencies = [
"curl-sys",
"libc",
"openssl-probe",
"openssl-sys",
"schannel",
"socket2 0.4.0",
"winapi 0.3.9",
]
[[package]]
name = "curl-sys"
version = "0.4.44+curl-7.77.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1"
dependencies = [
"cc",
"libc",
"libnghttp2-sys",
"libz-sys",
"openssl-sys",
"pkg-config",
"vcpkg",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "dashmap" name = "dashmap"
version = "4.0.2" version = "4.0.2"
@ -1638,6 +1669,17 @@ dependencies = [
"miniz_oxide 0.4.4", "miniz_oxide 0.4.4",
] ]
[[package]]
name = "flume"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bebadab126f8120d410b677ed95eee4ba6eb7c6dd8e34a5ec88a08050e26132"
dependencies = [
"futures-core",
"futures-sink",
"spinning_top",
]
[[package]] [[package]]
name = "fnv" name = "fnv"
version = "1.0.7" version = "1.0.7"
@ -2245,6 +2287,7 @@ version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce318d86a47d18d1db645c979214f809a6cd625202ad334ef75ca813b30dac80" checksum = "ce318d86a47d18d1db645c979214f809a6cd625202ad334ef75ca813b30dac80"
dependencies = [ dependencies = [
"async-std",
"async-trait", "async-trait",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"dashmap", "dashmap",
@ -2252,6 +2295,7 @@ dependencies = [
"http-types", "http-types",
"hyper 0.13.10", "hyper 0.13.10",
"hyper-tls 0.4.3", "hyper-tls 0.4.3",
"isahc",
"log", "log",
"tokio 0.2.25", "tokio 0.2.25",
] ]
@ -2495,6 +2539,29 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "isahc"
version = "0.9.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a"
dependencies = [
"bytes 0.5.6",
"crossbeam-utils",
"curl",
"curl-sys",
"flume",
"futures-lite",
"http",
"log",
"once_cell",
"slab",
"sluice",
"tracing",
"tracing-futures",
"url",
"waker-fn",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.1" version = "0.10.1"
@ -2618,6 +2685,16 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "libnghttp2-sys"
version = "0.1.6+1.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0af55541a8827e138d59ec9e5877fb6095ece63fb6f4da45e7491b4fbd262855"
dependencies = [
"cc",
"libc",
]
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
version = "0.22.2" version = "0.22.2"
@ -5528,6 +5605,17 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
[[package]]
name = "sluice"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fa0333a60ff2e3474a6775cc611840c2a55610c831dd366503474c02f1a28f5"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
]
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.6.1" version = "1.6.1"
@ -5572,6 +5660,15 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "spinning_top"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c"
dependencies = [
"lock_api",
]
[[package]] [[package]]
name = "stable_deref_trait" name = "stable_deref_trait"
version = "1.2.0" version = "1.2.0"
@ -5709,6 +5806,7 @@ dependencies = [
"async-std", "async-std",
"async-trait", "async-trait",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"encoding_rs",
"futures-util", "futures-util",
"http-client", "http-client",
"http-types", "http-types",
@ -5718,6 +5816,7 @@ dependencies = [
"pin-project-lite 0.2.6", "pin-project-lite 0.2.6",
"serde 1.0.126", "serde 1.0.126",
"serde_json", "serde_json",
"web-sys",
] ]
[[package]] [[package]]
@ -6218,9 +6317,21 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"log", "log",
"pin-project-lite 0.2.6", "pin-project-lite 0.2.6",
"tracing-attributes",
"tracing-core", "tracing-core",
] ]
[[package]]
name = "tracing-attributes"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]] [[package]]
name = "tracing-core" name = "tracing-core"
version = "0.1.18" version = "0.1.18"

View file

@ -16,7 +16,7 @@ nu-errors = { path="../nu-errors", version = "0.34.0" }
nu-plugin = { path="../nu-plugin", version = "0.34.0" } nu-plugin = { path="../nu-plugin", version = "0.34.0" }
nu-protocol = { path="../nu-protocol", version = "0.34.0" } nu-protocol = { path="../nu-protocol", version = "0.34.0" }
nu-source = { path="../nu-source", version = "0.34.0" } nu-source = { path="../nu-source", version = "0.34.0" }
surf = { version="2.2.0", default-features = false, features=["hyper-client"] } surf = { version="2.2.0", features=["hyper-client"] }
url = "2.2.1" url = "2.2.1"
mime = "0.3.16" mime = "0.3.16"

View file

@ -19,7 +19,7 @@ nu-protocol = { path="../nu-protocol", version = "0.34.0" }
nu-source = { path="../nu-source", version = "0.34.0" } nu-source = { path="../nu-source", version = "0.34.0" }
num-traits = "0.2.12" num-traits = "0.2.12"
serde_json = "1.0.57" serde_json = "1.0.57"
surf = { version="2.2.0", default-features = false, features=["hyper-client"] } surf = "2.2.0"
url = "2.1.1" url = "2.1.1"
[features] [features]