Skip to content

Commit e0cfc9d

Browse files
authored
Revert "refactor(fetch): reimplement fetch with hyper instead of reqwest (denoland#24237)" (denoland#24574)
This reverts commit f6fd661. I'm seeing a difference between canary and 1.45.2. In `deno-docs/reference_gen` I can't download dax when running `deno task types` ``` ~/src/deno-docs/reference_gen# deno upgrade --canary Looking up latest canary version Found latest version f6fd661 Downloading https://dl.deno.land/canary/f6fd6619e708a515831f707438368d81b0c9aa56/deno-aarch64-apple-darwin.zip Deno is upgrading to version f6fd661 Archive: /var/folders/9v/kys6gqns6kl8nksyn4l1f9v40000gn/T/.tmpb5lDnq/deno.zip inflating: deno Upgraded successfully ~/src/deno-docs/reference_gen# deno -v deno 1.45.2+f6fd661 ~/src/deno-docs/reference_gen# rm -rf /Users/ry/Library/Caches/deno ~/src/deno-docs/reference_gen# deno task types Task types deno task types:deno && deno task types:node Task types:deno deno run --allow-read --allow-write --allow-run --allow-env --allow-sys deno-docs.ts error: JSR package manifest for '@david/dax' failed to load. expected value at line 1 column 1 at file:///Users/ry/src/deno-docs/reference_gen/deno-docs.ts:2:15 ~/src/deno-docs/reference_gen# deno upgrade --version 1.45.2 Downloading https://github.com/denoland/deno/releases/download/v1.45.2/deno-aarch64-apple-darwin.zip Deno is upgrading to version 1.45.2 Archive: /var/folders/9v/kys6gqns6kl8nksyn4l1f9v40000gn/T/.tmp3R7uhF/deno.zip inflating: deno Upgraded successfully ~/src/deno-docs/reference_gen# rm -rf /Users/ry/Library/Caches/deno ~/src/deno-docs/reference_gen# deno task types Task types deno task types:deno && deno task types:node Task types:deno deno run --allow-read --allow-write --allow-run --allow-env --allow-sys deno-docs.ts Task types:node deno run --allow-read --allow-write=. --allow-env --allow-sys node-docs.ts ```
1 parent f6fd661 commit e0cfc9d

33 files changed

+346
-1531
lines changed

Cargo.lock

Lines changed: 6 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,13 @@ futures = "0.3.21"
115115
glob = "0.3.1"
116116
h2 = "0.4.4"
117117
http = "1.0"
118-
http-body = "1.0"
119-
http-body-util = "0.1.2"
118+
http-body-util = "0.1"
120119
http_v02 = { package = "http", version = "0.2.9" }
121120
httparse = "1.8.0"
122121
hyper = { version = "=1.4.0", features = ["full"] }
123-
hyper-rustls = { version = "0.26.0", default-features = false, features = ["http1", "http2", "tls12", "ring"] }
124-
hyper-util = { version = "=0.1.6", features = ["tokio", "client", "client-legacy", "server", "server-auto"] }
122+
hyper-util = { version = "=0.1.6", features = ["tokio", "server", "server-auto"] }
125123
hyper_v014 = { package = "hyper", version = "0.14.26", features = ["runtime", "http1"] }
126124
indexmap = { version = "2", features = ["serde"] }
127-
ipnet = "2.3"
128125
jsonc-parser = { version = "=0.23.0", features = ["serde"] }
129126
lazy-regex = "3"
130127
libc = "0.2.126"
@@ -176,13 +173,8 @@ termcolor = "1.1.3"
176173
thiserror = "1.0.61"
177174
tokio = { version = "1.36.0", features = ["full"] }
178175
tokio-metrics = { version = "0.3.0", features = ["rt"] }
179-
tokio-rustls = "0.25.0"
180-
tokio-socks = "0.5.1"
181176
tokio-util = "0.7.4"
182-
tower = { version = "0.4.13", default-features = false, features = ["util"] }
183-
tower-http = { version = "0.5.2", features = ["decompression-br", "decompression-gzip"] }
184177
tower-lsp = { version = "=0.20.0", features = ["proposed"] }
185-
tower-service = "0.3.2"
186178
twox-hash = "=1.6.3"
187179
# Upgrading past 2.4.1 may cause WPT failures
188180
url = { version = "< 2.5.0", features = ["serde", "expose_internals"] }

cli/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ faster-hex.workspace = true
107107
flate2.workspace = true
108108
fs3.workspace = true
109109
glob = "0.3.1"
110-
http.workspace = true
111-
http-body.workspace = true
112-
http-body-util.workspace = true
113-
hyper-util.workspace = true
114110
import_map = { version = "=0.20.0", features = ["ext"] }
115111
indexmap.workspace = true
116112
jsonc-parser.workspace = true
@@ -132,6 +128,7 @@ phf.workspace = true
132128
quick-junit = "^0.3.5"
133129
rand = { workspace = true, features = ["small_rng"] }
134130
regex.workspace = true
131+
reqwest.workspace = true
135132
ring.workspace = true
136133
rustyline.workspace = true
137134
rustyline-derive = "=0.7.0"

0 commit comments

Comments
 (0)