revert broken hyper upgrade (0.14.27 to 1.1.0)

This commit is contained in:
Brandon Thomas committed 2024-05-28 17:28:29 -04:00
1 parent 6727089835
commit bb4252fe27
11 files changed
+71 -127

No files matched your search

Generated
+61 -117
View File
@@ -102,8 +102,8 @@ dependencies = [
"encoding_rs",
"flate2",
"futures-core",
"h2 0.3.26",
"http 0.2.11",
"h2",
"http",
"httparse",
"httpdate",
"itoa 1.0.9",
@@ -176,7 +176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799"
dependencies = [
"bytestring",
"http 0.2.11",
"http",
"regex",
"serde",
"tracing",
@@ -205,7 +205,7 @@ dependencies = [
"futures-core",
"futures-util",
"mio 0.8.11",
"socket2",
"socket2 0.5.5",
"tokio",
"tracing",
]
@@ -266,7 +266,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"smallvec 1.11.2",
"socket2",
"socket2 0.5.5",
"time",
"url",
]
@@ -322,7 +322,7 @@ dependencies = [
"derive_more",
"futures-core",
"futures-util",
"http 0.2.11",
"http",
"impl-more",
"itertools 0.11.0",
"local-channel",
@@ -701,7 +701,7 @@ dependencies = [
"hex",
"hmac 0.12.1",
"http-types",
"hyper 0.14.28",
"hyper",
"hyper-tls",
"serde",
"serde_json",
@@ -747,12 +747,6 @@ dependencies = [
"quick-xml 0.30.0",
]
[[package]]
name = "atomic-waker"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "atomic-write-file"
version = "0.1.0"
@@ -769,7 +763,7 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
dependencies = [
"http 0.2.11",
"http",
"log",
"native-tls",
"serde",
@@ -844,9 +838,9 @@ dependencies = [
"bitflags 1.3.2",
"bytes 1.6.0",
"futures-util",
"http 0.2.11",
"http-body 0.4.5",
"hyper 0.14.28",
"http",
"http-body",
"hyper",
"itoa 1.0.9",
"matchit",
"memchr",
@@ -870,8 +864,8 @@ dependencies = [
"async-trait",
"bytes 1.6.0",
"futures-util",
"http 0.2.11",
"http-body 0.4.5",
"http",
"http-body",
"mime",
"rustversion",
"tower-layer",
@@ -2141,7 +2135,7 @@ dependencies = [
"google_drive_common",
"hashing",
"hostname",
"hyper 1.1.0",
"hyper",
"jobs_common",
"log",
"mimetypes",
@@ -2843,26 +2837,7 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
"http 0.2.11",
"indexmap 2.2.3",
"slab",
"tokio",
"tokio-util",
"tracing",
]
[[package]]
name = "h2"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
"atomic-waker",
"bytes 1.6.0",
"fnv",
"futures-core",
"futures-sink",
"http 1.1.0",
"http",
"indexmap 2.2.3",
"slab",
"tokio",
@@ -3019,17 +2994,6 @@ dependencies = [
"itoa 1.0.9",
]
[[package]]
name = "http"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
dependencies = [
"bytes 1.6.0",
"fnv",
"itoa 1.0.9",
]
[[package]]
name = "http-body"
version = "0.4.5"
@@ -3037,20 +3001,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes 1.6.0",
"http 0.2.11",
"http",
"pin-project-lite",
]
[[package]]
name = "http-body"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
dependencies = [
"bytes 1.6.0",
"http 1.1.0",
]
[[package]]
name = "http-range"
version = "0.1.5"
@@ -3067,7 +3021,7 @@ dependencies = [
"async-channel",
"base64 0.13.1",
"futures-lite",
"http 0.2.11",
"http",
"infer 0.2.3",
"pin-project-lite",
"rand 0.7.3",
@@ -3118,55 +3072,35 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.14.28"
version = "0.14.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
"bytes 1.6.0",
"futures-channel",
"futures-core",
"futures-util",
"h2 0.3.26",
"http 0.2.11",
"http-body 0.4.5",
"h2",
"http",
"http-body",
"httparse",
"httpdate",
"itoa 1.0.9",
"pin-project-lite",
"socket2",
"socket2 0.4.10",
"tokio",
"tower-service",
"tracing",
"want",
]
[[package]]
name = "hyper"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
dependencies = [
"bytes 1.6.0",
"futures-channel",
"futures-util",
"h2 0.4.5",
"http 1.1.0",
"http-body 1.0.0",
"httparse",
"httpdate",
"itoa 1.0.9",
"pin-project-lite",
"tokio",
"want",
]
[[package]]
name = "hyper-timeout"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
dependencies = [
"hyper 0.14.28",
"hyper",
"pin-project-lite",
"tokio",
"tokio-io-timeout",
@@ -3179,7 +3113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes 1.6.0",
"hyper 0.14.28",
"hyper",
"native-tls",
"tokio",
"tokio-native-tls",
@@ -3356,7 +3290,7 @@ dependencies = [
"google_drive_common",
"hashing",
"hostname",
"hyper 1.1.0",
"hyper",
"images",
"jobs_common",
"jsonpath_lib",
@@ -3607,7 +3541,7 @@ dependencies = [
"nom",
"once_cell",
"quoted_printable",
"socket2",
"socket2 0.5.5",
"tokio",
"url",
]
@@ -4180,7 +4114,7 @@ dependencies = [
"hashbrown 0.14.5",
"heck 0.4.1",
"hmac 0.12.1",
"hyper 1.1.0",
"hyper",
"indexmap 2.2.3",
"itertools 0.10.5",
"lazy_static",
@@ -4212,7 +4146,7 @@ dependencies = [
"sha1 0.10.6",
"sha2 0.10.8",
"simd-adler32",
"socket2",
"socket2 0.5.5",
"spin 0.9.8",
"sqlx",
"sqlx-core",
@@ -4567,7 +4501,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930"
dependencies = [
"async-trait",
"futures-core",
"http 0.2.11",
"http",
"opentelemetry",
"opentelemetry-proto",
"opentelemetry-semantic-conventions",
@@ -5456,10 +5390,10 @@ dependencies = [
"encoding_rs",
"futures-core",
"futures-util",
"h2 0.3.26",
"http 0.2.11",
"http-body 0.4.5",
"hyper 0.14.28",
"h2",
"http",
"http-body",
"hyper",
"hyper-tls",
"ipnet",
"js-sys",
@@ -5629,7 +5563,7 @@ dependencies = [
"futures 0.3.29",
"hex",
"hmac 0.12.1",
"http 0.2.11",
"http",
"log",
"maybe-async",
"md5",
@@ -6310,6 +6244,16 @@ dependencies = [
"serde",
]
[[package]]
name = "socket2"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
dependencies = [
"libc",
"winapi 0.3.9",
]
[[package]]
name = "socket2"
version = "0.5.5"
@@ -6652,9 +6596,9 @@ dependencies = [
"hashing",
"hex",
"hostname",
"http 0.2.11",
"http",
"http_server_common",
"hyper 1.1.0",
"hyper",
"infer 0.5.0",
"jwt",
"language-tags",
@@ -7236,7 +7180,7 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"socket2 0.5.5",
"tokio-macros",
"windows-sys 0.48.0",
]
@@ -7498,10 +7442,10 @@ dependencies = [
"bytes 1.6.0",
"futures-core",
"futures-util",
"h2 0.3.26",
"http 0.2.11",
"http-body 0.4.5",
"hyper 0.14.28",
"h2",
"http",
"http-body",
"hyper",
"hyper-timeout",
"percent-encoding",
"pin-project",
@@ -7600,7 +7544,7 @@ dependencies = [
"google_drive_common",
"hashing",
"hostname",
"hyper 1.1.0",
"hyper",
"jobs_common",
"log",
"my-workspace-hack",
@@ -7630,7 +7574,7 @@ dependencies = [
"filesys",
"hashing",
"hostname",
"hyper 1.1.0",
"hyper",
"jobs_common",
"lfu",
"log",
@@ -7673,7 +7617,7 @@ dependencies = [
"base64 0.13.1",
"byteorder",
"bytes 1.6.0",
"http 0.2.11",
"http",
"httparse",
"log",
"rand 0.8.5",
@@ -7703,7 +7647,7 @@ dependencies = [
"futures 0.3.29",
"futures-util",
"hostname",
"hyper 1.1.0",
"hyper",
"lazy_static",
"log",
"magic-crypt",
@@ -7745,7 +7689,7 @@ dependencies = [
"chrono",
"displaydoc",
"futures 0.3.29",
"http 0.2.11",
"http",
"once_cell",
"reqwest",
"serde",
@@ -7785,7 +7729,7 @@ dependencies = [
"async-trait",
"base64 0.13.1",
"displaydoc",
"http 0.2.11",
"http",
"once_cell",
"rand 0.8.5",
"reqwest",
@@ -8123,7 +8067,7 @@ dependencies = [
"google_drive_common",
"hashing",
"hostname",
"hyper 1.1.0",
"hyper",
"jobs_common",
"log",
"my-workspace-hack",
@@ -8152,7 +8096,7 @@ dependencies = [
"filesys",
"google_drive_common",
"hostname",
"hyper 1.1.0",
"hyper",
"jobs_common",
"log",
"my-workspace-hack",
@@ -8373,7 +8317,7 @@ dependencies = [
"futures-util",
"hostname",
"http_server_common",
"hyper 1.1.0",
"hyper",
"lazy_static",
"limitation",
"log",
+1 -1
View File
@@ -45,7 +45,7 @@ getrandom = { version = "0.2.11", default-features = false, features = ["std"] }
hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.5", features = ["raw"] }
hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12.3", features = ["raw"] }
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.1.0", features = ["full"] }
hyper = { version = "0.14.27", features = ["full"] }
indexmap = { version = "2.2.3", features = ["serde"] }
itertools = { version = "0.10.5" }
lazy_static = { version = "1.4.0", default-features = false, features = ["spin_no_std"] }
+1 -1
View File
@@ -63,7 +63,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Serialization
serde = "1.0.125"
+1 -1
View File
@@ -68,7 +68,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# HTTP Server
actix-web = "4.4.0"
@@ -52,7 +52,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Serialization
serde = "1.0.125"
@@ -53,7 +53,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Serialization
serde = "1.0.125"
@@ -52,7 +52,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Serialization
serde = "1.0.125"
@@ -50,7 +50,7 @@ tokio = { version = "1.34.0", features = ["macros"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Serialization
serde = "1.0.125"
@@ -72,7 +72,7 @@ tokio-tungstenite = { version = "0.15.0", features = ["rustls", "rustls-tls"] }
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Crypto
magic-crypt = "3.1.13" # encrypting sort IDs for the frontend so we don't leak info
@@ -154,7 +154,7 @@ jwt = "0.13.0"
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Money
async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] }
@@ -83,7 +83,7 @@ actix-web-actors = "4.2.0"
# NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime
# NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.
hyper = { version = "1.1.0" }
hyper = { version = "0.14.24" }
# Crypto
magic-crypt = "3.1.13" # encrypting sort IDs for the frontend so we don't leak info