Unpin proc-macro-hack, roll Rust deps

With bazelbuild/rules_rust#2663 we no longer need to manually specify the proc-macro-hack version to manage Windows path length constraints.
cloudflare · Jun 11, 2024 · 0d4b282 · 0d4b282
1 parent 6d46942
commit 0d4b282
Show file tree

Hide file tree

Showing 29 changed files with 120 additions and 120 deletions.
diff --git a/rust-deps/BUILD.bazel b/rust-deps/BUILD.bazel
@@ -65,6 +65,8 @@ crates_vendor(
    render_config = render_config(generate_target_compatible_with = False),
 )
 
+# TODO(cleanup): Switching to rust_library() would reduce the overhead of this by not creating a
+# crate-of-crates but this previously broke the Windows build.
 rust_static_library(
     name = "rust-deps",
     srcs = ["src/lib.rs"],

diff --git a/rust-deps/crates/BUILD.ahash-0.8.11.bazel b/rust-deps/crates/BUILD.ahash-0.8.11.bazel
@@ -67,7 +67,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "ahash_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -87,6 +87,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "ahash",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -106,6 +107,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":ahash_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.anyhow-1.0.86.bazel b/rust-deps/crates/BUILD.anyhow-1.0.86.bazel
@@ -52,7 +52,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "anyhow_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -76,6 +76,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "anyhow",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -92,6 +93,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":anyhow_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.bazel b/rust-deps/crates/BUILD.bazel
@@ -39,7 +39,7 @@ alias(
 
 alias(
     name = "clang-ast",
-    actual = "@crates_vendor__clang-ast-0.1.23//:clang_ast",
+    actual = "@crates_vendor__clang-ast-0.1.24//:clang_ast",
     tags = ["manual"],
 )
 
@@ -61,15 +61,9 @@ alias(
     tags = ["manual"],
 )
 
-alias(
-    name = "proc-macro-hack",
-    actual = "@crates_vendor__proc-macro-hack-0.5.19//:proc_macro_hack",
-    tags = ["manual"],
-)
-
 alias(
     name = "serde",
-    actual = "@crates_vendor__serde-1.0.202//:serde",
+    actual = "@crates_vendor__serde-1.0.203//:serde",
     tags = ["manual"],
 )
 

diff --git a/rust-deps/crates/BUILD.cc-1.0.98.bazel → rust-deps/crates/BUILD.cc-1.0.99.bazel b/rust-deps/crates/BUILD.cc-1.0.98.bazel → rust-deps/crates/BUILD.cc-1.0.99.bazel
@@ -40,5 +40,5 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.98",
+    version = "1.0.99",
 )
diff --git a/...-deps/crates/BUILD.clang-ast-0.1.23.bazel → ...-deps/crates/BUILD.clang-ast-0.1.24.bazel b/...-deps/crates/BUILD.clang-ast-0.1.23.bazel → ...-deps/crates/BUILD.clang-ast-0.1.24.bazel
@@ -40,9 +40,9 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.1.23",
+    version = "0.1.24",
     deps = [
         "@crates_vendor__rustc-hash-1.1.0//:rustc_hash",
-        "@crates_vendor__serde-1.0.202//:serde",
+        "@crates_vendor__serde-1.0.203//:serde",
     ],
 )
diff --git a/rust-deps/crates/BUILD.cssparser-0.27.2.bazel b/rust-deps/crates/BUILD.cssparser-0.27.2.bazel
@@ -47,7 +47,7 @@ rust_library(
     version = "0.27.2",
     deps = [
         "@crates_vendor__cssparser-0.27.2//:build_script_build",
-        "@crates_vendor__dtoa-short-0.3.4//:dtoa_short",
+        "@crates_vendor__dtoa-short-0.3.5//:dtoa_short",
         "@crates_vendor__itoa-0.4.8//:itoa",
         "@crates_vendor__matches-0.1.10//:matches",
         "@crates_vendor__phf-0.8.0//:phf",
@@ -56,7 +56,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "cssparser_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -76,6 +76,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "cssparser",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -89,14 +90,14 @@ cargo_build_script(
     version = "0.27.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@crates_vendor__proc-macro2-1.0.83//:proc_macro2",
+        "@crates_vendor__proc-macro2-1.0.85//:proc_macro2",
         "@crates_vendor__quote-1.0.36//:quote",
         "@crates_vendor__syn-1.0.109//:syn",
     ],
 )
 
 alias(
     name = "build_script_build",
-    actual = ":cssparser_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.cssparser-macros-0.6.1.bazel b/rust-deps/crates/BUILD.cssparser-macros-0.6.1.bazel
@@ -43,6 +43,6 @@ rust_proc_macro(
     version = "0.6.1",
     deps = [
         "@crates_vendor__quote-1.0.36//:quote",
-        "@crates_vendor__syn-2.0.65//:syn",
+        "@crates_vendor__syn-2.0.66//:syn",
     ],
 )
diff --git a/rust-deps/crates/BUILD.derive_more-0.99.17.bazel b/rust-deps/crates/BUILD.derive_more-0.99.17.bazel
@@ -71,7 +71,7 @@ rust_proc_macro(
     version = "0.99.17",
     deps = [
         "@crates_vendor__convert_case-0.4.0//:convert_case",
-        "@crates_vendor__proc-macro2-1.0.83//:proc_macro2",
+        "@crates_vendor__proc-macro2-1.0.85//:proc_macro2",
         "@crates_vendor__quote-1.0.36//:quote",
         "@crates_vendor__syn-1.0.109//:syn",
     ],

diff --git a/...-deps/crates/BUILD.dtoa-short-0.3.4.bazel → ...-deps/crates/BUILD.dtoa-short-0.3.5.bazel b/...-deps/crates/BUILD.dtoa-short-0.3.4.bazel → ...-deps/crates/BUILD.dtoa-short-0.3.5.bazel
@@ -40,7 +40,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.3.4",
+    version = "0.3.5",
     deps = [
         "@crates_vendor__dtoa-1.0.9//:dtoa",
     ],

diff --git a/rust-deps/crates/BUILD.getrandom-0.1.16.bazel b/rust-deps/crates/BUILD.getrandom-0.1.16.bazel
@@ -66,7 +66,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "getrandom_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -89,6 +89,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "getrandom",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -105,6 +106,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":getrandom_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.libc-0.2.155.bazel b/rust-deps/crates/BUILD.libc-0.2.155.bazel
@@ -52,7 +52,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "libc_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -76,6 +76,7 @@ cargo_build_script(
         ],
     ),
     edition = "2015",
+    pkg_name = "libc",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -92,6 +93,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":libc_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.phf-0.8.0.bazel b/rust-deps/crates/BUILD.phf-0.8.0.bazel
@@ -39,7 +39,7 @@ rust_library(
     edition = "2018",
     proc_macro_deps = [
         "@crates_vendor__phf_macros-0.8.0//:phf_macros",
-        "@crates_vendor__proc-macro-hack-0.5.19//:proc_macro_hack",
+        "@crates_vendor__proc-macro-hack-0.5.20-deprecated//:proc_macro_hack",
     ],
     rustc_flags = [
         "--cap-lints=allow",

diff --git a/rust-deps/crates/BUILD.phf_macros-0.8.0.bazel b/rust-deps/crates/BUILD.phf_macros-0.8.0.bazel
@@ -31,7 +31,7 @@ rust_proc_macro(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@crates_vendor__proc-macro-hack-0.5.19//:proc_macro_hack",
+        "@crates_vendor__proc-macro-hack-0.5.20-deprecated//:proc_macro_hack",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -47,7 +47,7 @@ rust_proc_macro(
     deps = [
         "@crates_vendor__phf_generator-0.8.0//:phf_generator",
         "@crates_vendor__phf_shared-0.8.0//:phf_shared",
-        "@crates_vendor__proc-macro2-1.0.83//:proc_macro2",
+        "@crates_vendor__proc-macro2-1.0.85//:proc_macro2",
         "@crates_vendor__quote-1.0.36//:quote",
         "@crates_vendor__syn-1.0.109//:syn",
     ],

diff --git a/...crates/BUILD.proc-macro-hack-0.5.19.bazel → ...D.proc-macro-hack-0.5.20+deprecated.bazel b/...crates/BUILD.proc-macro-hack-0.5.19.bazel → ...D.proc-macro-hack-0.5.20+deprecated.bazel
@@ -41,14 +41,14 @@ rust_proc_macro(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.5.19",
+    version = "0.5.20+deprecated",
     deps = [
-        "@crates_vendor__proc-macro-hack-0.5.19//:build_script_build",
+        "@crates_vendor__proc-macro-hack-0.5.20-deprecated//:build_script_build",
     ],
 )
 
 cargo_build_script(
-    name = "proc-macro-hack_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -68,6 +68,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "proc-macro-hack",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -78,12 +79,12 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.5.19",
+    version = "0.5.20+deprecated",
     visibility = ["//visibility:private"],
 )
 
 alias(
     name = "build_script_build",
-    actual = ":proc-macro-hack_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/...eps/crates/BUILD.proc-macro2-1.0.83.bazel → ...eps/crates/BUILD.proc-macro2-1.0.85.bazel b/...eps/crates/BUILD.proc-macro2-1.0.83.bazel → ...eps/crates/BUILD.proc-macro2-1.0.85.bazel
@@ -45,15 +45,15 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.83",
+    version = "1.0.85",
     deps = [
-        "@crates_vendor__proc-macro2-1.0.83//:build_script_build",
+        "@crates_vendor__proc-macro2-1.0.85//:build_script_build",
         "@crates_vendor__unicode-ident-1.0.12//:unicode_ident",
     ],
 )
 
 cargo_build_script(
-    name = "proc-macro2_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -77,6 +77,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
+    pkg_name = "proc-macro2",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -87,12 +88,12 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.83",
+    version = "1.0.85",
     visibility = ["//visibility:private"],
 )
 
 alias(
     name = "build_script_build",
-    actual = ":proc-macro2_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.quote-1.0.36.bazel b/rust-deps/crates/BUILD.quote-1.0.36.bazel
@@ -46,6 +46,6 @@ rust_library(
     ],
     version = "1.0.36",
     deps = [
-        "@crates_vendor__proc-macro2-1.0.83//:proc_macro2",
+        "@crates_vendor__proc-macro2-1.0.85//:proc_macro2",
     ],
 )
diff --git a/rust-deps/crates/BUILD.selectors-0.22.0.bazel b/rust-deps/crates/BUILD.selectors-0.22.0.bazel
@@ -61,7 +61,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "selectors_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -81,6 +81,7 @@ cargo_build_script(
         ],
     ),
     edition = "2015",
+    pkg_name = "selectors",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -100,6 +101,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":selectors_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )
diff --git a/rust-deps/crates/BUILD.semver-1.0.23.bazel b/rust-deps/crates/BUILD.semver-1.0.23.bazel
@@ -52,7 +52,7 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "semver_bs",
+    name = "_bs",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = False,
@@ -76,6 +76,7 @@ cargo_build_script(
         ],
     ),
     edition = "2018",
+    pkg_name = "semver",
     rustc_flags = [
         "--cap-lints=allow",
     ],
@@ -92,6 +93,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = ":semver_bs",
+    actual = ":_bs",
     tags = ["manual"],
 )