Update modern Hyper deps in shims

Summary: This brings changes into the OSS shim that should have been included in D76918206 but were missed (partially due to the OSS CI job already being broken at the time).

Reviewed By: dtolnay

Differential Revision: D80467762

fbshipit-source-id: 1b3aa5d42bdb73a1bb2f2957cd340484b50657a9

Author: Ben Carr

shim/buck2/proto_defs.bzl

@@ -10,7 +10,9 @@ load(
     "@shim//:shims.bzl",
     _proto_srcs = "proto_srcs",
     _rust_protobuf_library = "rust_protobuf_library",
+    _rust_protobuf_library_prost_0134 = "rust_protobuf_library_prost_0134",
 )
 
 rust_protobuf_library = _rust_protobuf_library
+rust_protobuf_library_prost_0134 = _rust_protobuf_library_prost_0134
 proto_srcs = _proto_srcs

shim/shims.bzl

@@ -350,22 +350,90 @@ def rust_protobuf_library(
         name,
         srcs,
         build_script,
-        protos = None,  # Pass a list of files. Thye'll be placed in the cwd. Prefer using proto_srcs.
+        protos = None,  # Pass a list of files. They'll be placed in the cwd. Prefer using proto_srcs.
         deps = None,
         test_deps = None,
         doctests = True,
         build_env = None,
-        proto_srcs = None):  # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
+        proto_srcs = None,
+        crate_name = None):  # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
+    _rust_protobuf_library(
+        name,
+        srcs,
+        build_script,
+        "buck2_protoc_dev",
+        "prost",
+        "prost-types",
+        "tonic",
+        protos,
+        deps,
+        test_deps,
+        doctests,
+        build_env,
+        proto_srcs,
+        crate_name,
+    )
+
+def rust_protobuf_library_prost_0134(
+        name,
+        srcs,
+        build_script,
+        protos = None,  # Pass a list of files. They'll be placed in the cwd. Prefer using proto_srcs.
+        deps = None,
+        test_deps = None,
+        doctests = True,
+        build_env = None,
+        proto_srcs = None,
+        crate_name = None):
+    # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
+    _rust_protobuf_library(
+        name,
+        srcs,
+        build_script,
+        "buck2_protoc_dev-tonic-0-12-3",
+        "prost-0-13-4",
+        "prost-types-0-13-4",
+        "tonic-0-12-3",
+        protos,
+        deps,
+        test_deps,
+        doctests,
+        build_env,
+        proto_srcs,
+        crate_name,
+    )
+
+def _rust_protobuf_library(
+        name,
+        srcs,
+        build_script,
+        buck2_protoc_dev,
+        versioned_prost_target,
+        versioned_prost_types_target,
+        versioned_tonic_target,
+        protos,  # Pass a list of files. They'll be placed in the cwd. Prefer using proto_srcs.
+        deps,
+        test_deps,
+        doctests,
+        build_env,
+        proto_srcs,
+        crate_name):  # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
     build_name = name + "-build"
     proto_name = name + "-proto"
 
+    deps = (deps or []) + [
+        "fbsource//third-party/rust:" + versioned_prost_target,
+        "fbsource//third-party/rust:" + versioned_prost_types_target,
+        "fbsource//third-party/rust:" + versioned_tonic_target,
+    ]
+
     rust_binary(
         name = build_name,
         srcs = [build_script],
         crate_root = build_script,
         deps = [
-            "fbsource//third-party/rust:tonic-build",
-            "//buck2/app/buck2_protoc_dev:buck2_protoc_dev",
+            "fbsource//third-party/rust:" + versioned_tonic_target,
+            "//buck2/app/buck2_protoc_dev:" + buck2_protoc_dev,
         ],
     )
 
@@ -398,11 +466,8 @@ def rust_protobuf_library(
             "OUT_DIR": "$(location :{})".format(proto_name),
         },
         test_deps = test_deps,
-        deps = [
-            "fbsource//third-party/rust:prost",
-            "fbsource//third-party/rust:prost-types",
-            "fbsource//third-party/rust:tonic",
-        ] + (deps or []),
+        deps = deps,
+        crate = crate_name or name,
     )
 
 ProtoSrcsInfo = provider(fields = ["srcs"])

shim/third-party/rust/Cargo.toml

@@ -97,14 +97,22 @@ hex = "0.4.3"
 higher-order-closure = "0.0.5"
 hostname = "0.3.1"
 http = "0.2"
+http-1 = { package = "http", version = "1.3.1" }
+http-body-util = "0.1.0"
 httparse = "1.7.1"
 httptest = "0.15"
+httptest-0-16 = { package = "httptest", version = "0.16" }
 humantime = "2.0.1"
 hyper-0-14 = { package = "hyper", version = "0.14.26", features = ["client", "http1", "http2", "stream"] }
+hyper-1-5-1 = { package = "hyper", version = "1.5.1", features = ["client", "http1", "http2"] }
+hyperlocal-0-9 = { package = "hyperlocal", version = "0.9", features = ["client"] }
 hyper-proxy = { git = "https://github.com/get9/hyper-proxy", rev = "80ac13e5bc89fa8e41c6155aa1bcc733242a158d", features = ["rustls"], default_features = false } # branch = tokio-rustls-0.23 Many PRs to bump versions (#28, #30, #31) are several years old, possibly abandoned crate. This fork contains changes from #28 + changes to upgrade rustls to 0.21.
+hyper-proxy2 = { version = "0.1", features = ["rustls"], default-features = false }
 hyper-rustls = { version = "0.24.0", features = ["http2"] }
+hyper-rustls-0-26 = { package = "hyper-rustls", version = "0.26.0", features = ["http2"] }
 hyper-timeout = "0.4"
-hyper-unix-connector = "0.2"
+hyper-timeout-0-5 = { package = "hyper-timeout", version = "0.5" }
+hyper-util = "0.1.10"
 indent_write = "2.2.0"
 indenter = "0.3.3"
 indexmap = { version = "2.9.0", features = ["arbitrary", "rayon", "serde"] }
@@ -136,6 +144,7 @@ memmap2 = "0.5.0"
 memoffset = "0.6.4"
 mimalloc = { version = "0.1.46", default-features = false }
 multimap = "0.8.2"
+native-tls = "0.2"
 nix = { version = "0.30.1", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
 nom = "8"
 nom-language = "0.1"
@@ -158,10 +167,14 @@ plist = "0.5"
 pretty_assertions = "1.2.1"
 probminhash = { git = "https://github.com/krallin/probminhash", rev = "3d6b7a5315305c2893a7a04e0de9e23b305992c5", default-features = false } # WAITING_FOR_PR https://github.com/jean-pierreBoth/probminhash/pull/4
 proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
-prost = "0.12"
-prost-build = "0.12"
+prost = { version = "0.12", default-features = false }
+prost-0-13-4 = { package = "prost", version = "0.13.4", default-features = false }
+prost-types = { version = "0.12", default-features = false }
+prost-types-0-13-4 = { package = "prost-types", version = "0.13.4", default-features = false }
+prost-build = { version = "0.12", features = ["cleanup-markdown"] }
+prost-build-0-13-4 = { package = "prost-build", version = "0.13.4", features = ["cleanup-markdown"] }
 prost-derive = "0.12"
-prost-types = "0.12"
+prost-derive-0-13-4 = { package = "prost-derive", version = "0.13.4" }
 protoc-bin-vendored = "3.0.0"
 psutil = "3.2"
 ptyprocess = "0.4"
@@ -177,6 +190,7 @@ ring = "=0.17.5" # Upgrading this is possible, but a pain, so we don't want to p
 rusqlite = { version = "0.33", features = ["bundled"] }
 rustc-hash = "2.1.0"
 rustls = "0.21.0"
+rustls-0-22 = { package = "rustls", version = "0.22" }
 rustls-native-certs = { package = "rustls-native-certs", version = "0.6.2" }
 rustls-native-certs-0-8-1 = { package = "rustls-native-certs", version = "0.8.1" }
 rustls-pemfile = { package = "rustls-pemfile", version = "1.0.0" }
@@ -217,15 +231,18 @@ textwrap = { version = "0.11", features = ["term_size"] }
 thiserror = "1.0.36"
 threadpool = "1.8.1"
 tokio = { version = "1.25.0", features = ["full", "test-util", "tracing"] }
-tokio-rustls = { package = "tokio-rustls", version = "0.24.1", features = ["dangerous_configuration"] }
+tokio-rustls = { version = "0.24.1", features = ["dangerous_configuration"] }
+tokio-rustls-0-25 = { package = "tokio-rustls", version = "0.25" }
 tokio-stream = { version = "0.1.14", features = ["fs", "io-util", "net", "signal", "sync", "time"] }
 tokio-util = { version = "0.6", features = ["full"] }
 toml = "0.5"
 tonic = { version = "0.10.2", features = ["tls", "tls-webpki-roots"] }
-tonic-build = { version = "0.10.2", features = ["cleanup-markdown", "prost"] }
+tonic-0-12-3 = { package = "tonic", version = "0.12.3", features = ["tls", "tls-webpki-roots"] }
+tonic-build = { version = "0.10.2", features = ["prost", "cleanup-markdown"] }
+tonic-build-0-12-3 = { package = "tonic-build", version = "0.12.3", features = ["prost", "cleanup-markdown"] }
 tower = "0.4"
 tower-layer = "0.3.1"
-tower-service = "0.3.2"
+tower-service = "0.3.3"
 tracing = "0.1.22"
 tracing-core = "0.1.32"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }