Unverified Commit 0a02fd82 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

Turbopack: Remove workaround in hyper for rustc miscompilation bug on macos intel (#84578)

Reverts https://github.com/vercel/next.js/pull/81950

This bug was fixed a few months ago upstream in rustc with https://github.com/rust-lang/rust/pull/143126

We worked around this by patching the hyper crate since updating rustc was too risky to do in a patch release. We've since upgraded our toolchain.
parent 82bb2558
...@@ -2831,12 +2831,14 @@ dependencies = [ ...@@ -2831,12 +2831,14 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.6.0" version = "1.7.0"
source = "git+https://github.com/bgw/hyper-rs.git?branch=v1.6.0-with-macos-intel-miscompilation-workaround#ab3544930722e6c270c16d3239dbb1d58f713393" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
dependencies = [ dependencies = [
"atomic-waker",
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-util", "futures-core",
"h2 0.4.7", "h2 0.4.7",
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
...@@ -2844,6 +2846,7 @@ dependencies = [ ...@@ -2844,6 +2846,7 @@ dependencies = [
"httpdate", "httpdate",
"itoa", "itoa",
"pin-project-lite", "pin-project-lite",
"pin-utils",
"smallvec", "smallvec",
"tokio", "tokio",
"want", "want",
...@@ -2856,7 +2859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -2856,7 +2859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
dependencies = [ dependencies = [
"http 1.1.0", "http 1.1.0",
"hyper 1.6.0", "hyper 1.7.0",
"hyper-util", "hyper-util",
"rustls", "rustls",
"rustls-native-certs", "rustls-native-certs",
...@@ -2873,7 +2876,7 @@ version = "0.5.2" ...@@ -2873,7 +2876,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
dependencies = [ dependencies = [
"hyper 1.6.0", "hyper 1.7.0",
"hyper-util", "hyper-util",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
...@@ -2901,7 +2904,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" ...@@ -2901,7 +2904,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
dependencies = [ dependencies = [
"bytes", "bytes",
"http-body-util", "http-body-util",
"hyper 1.6.0", "hyper 1.7.0",
"hyper-util", "hyper-util",
"native-tls", "native-tls",
"tokio", "tokio",
...@@ -2935,7 +2938,7 @@ dependencies = [ ...@@ -2935,7 +2938,7 @@ dependencies = [
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"hyper 1.6.0", "hyper 1.7.0",
"ipnet", "ipnet",
"libc", "libc",
"percent-encoding", "percent-encoding",
...@@ -4073,7 +4076,7 @@ dependencies = [ ...@@ -4073,7 +4076,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.6.0", "hyper 1.7.0",
"hyper-util", "hyper-util",
"log", "log",
"rand 0.9.0", "rand 0.9.0",
...@@ -5903,7 +5906,7 @@ dependencies = [ ...@@ -5903,7 +5906,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.6.0", "hyper 1.7.0",
"hyper-rustls", "hyper-rustls",
"hyper-tls 0.6.0", "hyper-tls 0.6.0",
"hyper-util", "hyper-util",
...@@ -8853,7 +8856,7 @@ dependencies = [ ...@@ -8853,7 +8856,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.6.0", "hyper 1.7.0",
"hyper-timeout", "hyper-timeout",
"hyper-util", "hyper-util",
"percent-encoding", "percent-encoding",
......
...@@ -450,5 +450,4 @@ webbrowser = "0.8.7" ...@@ -450,5 +450,4 @@ webbrowser = "0.8.7"
inventory = "0.3.21" inventory = "0.3.21"
[patch.crates-io] [patch.crates-io]
hyper = { git = "https://github.com/bgw/hyper-rs.git", branch = "v1.6.0-with-macos-intel-miscompilation-workaround" }
mdxjs = { git = "https://github.com/mischnic/mdxjs-rs.git", branch = "swc-core-32" } mdxjs = { git = "https://github.com/mischnic/mdxjs-rs.git", branch = "swc-core-32" }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment