Skip to content

Commit

Permalink
10-17-24 Roll deps, minor cleanup (#2945)
Browse files Browse the repository at this point in the history
* [nfc] Cleanup: Drop orphaned makeAlarmTaskForPreview() declaration

This function ceased to exist in 29980e0.

* Roll dependencies
- For rules_esbuild, use latest available esbuild version by default (0.24 as of
  writing)
- Clean up rules_fuzzing dependency – this appears to no longer be needed with
  current tcmalloc
  • Loading branch information
fhanau authored Oct 18, 2024
1 parent 3741817 commit ce91ced
Show file tree
Hide file tree
Showing 34 changed files with 139 additions and 173 deletions.
28 changes: 2 additions & 26 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ filegroup(

# tcmalloc requires Abseil.
#
# WARNING: This MUST appear before rules_fuzzing_dependencies(), below. Otherwise,
# rules_fuzzing_dependencies() will choose to pull in an older version of Abseil. Absurdly, Bazel
# simply ignores later attempts to define the same repo name, rather than erroring out. This led
# to confusing compiler errors in tcmalloc in the past.
git_repository(
name = "com_google_absl",
commit = "ed3733b91e472a1e7a641c1f0c1e6c0ea698e958",
Expand Down Expand Up @@ -155,26 +151,6 @@ bind(
actual = "@com_google_absl//absl/types:optional",
)

# tcmalloc requires this "rules_fuzzing" package. Its build files fail analysis without it, even
# though it is unused for our purposes.
http_archive(
name = "rules_fuzzing",
integrity = "sha256-PsDu4FskNVLMSnhLMDI9CIv3PLIXfd2gLIJ+aJgZM/E=",
strip_prefix = "rules_fuzzing-0.5.2",
url = "https://github.com/bazelbuild/rules_fuzzing/archive/refs/tags/v0.5.2.tar.gz",
)

load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")

rules_fuzzing_dependencies(
honggfuzz = False,
jazzer = False,
)

load("@rules_fuzzing//fuzzing:init.bzl", "rules_fuzzing_init")

rules_fuzzing_init()

# OK, now we can bring in tcmalloc itself.
http_archive(
name = "com_google_tcmalloc",
Expand Down Expand Up @@ -269,11 +245,11 @@ load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependenc

rules_esbuild_dependencies()

load("@aspect_rules_esbuild//esbuild:repositories.bzl", "esbuild_register_toolchains")
load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")

esbuild_register_toolchains(
name = "esbuild",
esbuild_version = "0.23.0",
esbuild_version = LATEST_ESBUILD_VERSION,
)

# ========================================================================================
Expand Down
8 changes: 4 additions & 4 deletions build/deps/gen/dep_aspect_bazel_lib.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

load("@//:build/http.bzl", "http_archive")

TAG_NAME = "v2.9.1"
URL = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.1/bazel-lib-v2.9.1.tar.gz"
STRIP_PREFIX = "bazel-lib-2.9.1"
SHA256 = "f93d386d8d0b0149031175e81df42a488be4267c3ca2249ba5321c23c60bc1f0"
TAG_NAME = "v2.9.2"
URL = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.2/bazel-lib-v2.9.2.tar.gz"
STRIP_PREFIX = "bazel-lib-2.9.2"
SHA256 = "0e31778f1fd574d2c05d238bfc4c785fa4b7e50a5ef38b506e01cfd8ec2fccb3"
TYPE = "tgz"

def dep_aspect_bazel_lib():
Expand Down
8 changes: 4 additions & 4 deletions build/deps/gen/dep_capnp_cpp.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

load("@//:build/http.bzl", "http_archive")

URL = "https://github.com/capnproto/capnproto/tarball/371a221a8708abb2ff36c09bc3ab792170fd07bd"
STRIP_PREFIX = "capnproto-capnproto-371a221/c++"
SHA256 = "85e523a85df19d578a5f025ba8114d5e1439fffafe9a4fc0f72714bc85b2380d"
URL = "https://github.com/capnproto/capnproto/tarball/3c849db4caa127f75fefcfdc9e7105c8a62cbed0"
STRIP_PREFIX = "capnproto-capnproto-3c849db/c++"
SHA256 = "acc108b7cb8d3ef6fd37da19529b5a97940e49c75676bb3c8749e32478628265"
TYPE = "tgz"
COMMIT = "371a221a8708abb2ff36c09bc3ab792170fd07bd"
COMMIT = "3c849db4caa127f75fefcfdc9e7105c8a62cbed0"

def dep_capnp_cpp():
http_archive(
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_simdutf.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

load("@//:build/http.bzl", "http_archive")

TAG_NAME = "v5.5.0"
URL = "https://github.com/simdutf/simdutf/releases/download/v5.5.0/singleheader.zip"
TAG_NAME = "v5.6.0"
URL = "https://github.com/simdutf/simdutf/releases/download/v5.6.0/singleheader.zip"
STRIP_PREFIX = ""
SHA256 = "aae1a08b1fffcdb17a83670c482eaed0aae6f288bb59496da100c0d7cfacfb24"
SHA256 = "4e5491d55eb50665ced301d43cc2c164c6e3c201083c95f4ba82a89af3bef790"
TYPE = "zip"

def dep_simdutf():
Expand Down
9 changes: 0 additions & 9 deletions deps/rust/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ crates_vendor(
],
)

# define the path to the lolhtml headers, this is clunky but allows us to avoid cloning the
# repository twice.
alias(
name = "lol_html_api",
actual = "@crates_vendor__lol_html-1.2.1//:c-api/include/lol_html.h",
tags = ["manual"],
visibility = ["//visibility:public"],
)

# Windows build fixes due to rust libraries missing symbols:
# https://github.com/bazelbuild/rules_rust/blob/144d34fd/ffi/cc/global_allocator_library/BUILD.bazel#L3
# `empty_lib` static library will bring all the symbols in.
Expand Down
2 changes: 1 addition & 1 deletion deps/rust/BUILD.lolhtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cc_library(
name = "lolhtml",
hdrs = ["@crates_vendor__lol_html-1.2.1//:c-api/include/lol_html.h"],
hdrs = ["@crates_vendor__lol_html-2.0.0//:c-api/include/lol_html.h"],
include_prefix = "c-api/include",
strip_include_prefix = "c-api/include",
visibility = ["//visibility:public"],
Expand Down
48 changes: 24 additions & 24 deletions deps/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deps/rust/cargo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RTTI_PACKAGES = {
PACKAGES = RTTI_PACKAGES | {
"lolhtml": crate.spec(
git = "https://github.com/cloudflare/lol-html.git",
rev = "7db3d8d9fa9f3fee6ffe36c3f68f14e160476e07",
rev = "4f8becea13a0021c8b71abd2dcc5899384973b66",
),
"capnp": crate.spec(version = "0.20"),
"capnpc": crate.spec(version = "0.20"),
Expand Down
10 changes: 5 additions & 5 deletions deps/rust/crates/BUILD.ahash-0.8.11.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@ rust_library(
"@crates_vendor__zerocopy-0.7.35//:zerocopy",
] + select({
"@rules_rust//rust/platform:aarch64-apple-darwin": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.20.2//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.20.2//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-apple-darwin": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.20.2//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.20.2//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.20.2//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"//conditions:default": [],
}),
Expand Down
6 changes: 3 additions & 3 deletions deps/rust/crates/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ alias(

alias(
name = "capnp",
actual = "@crates_vendor__capnp-0.20.1//:capnp",
actual = "@crates_vendor__capnp-0.20.2//:capnp",
tags = ["manual"],
)

Expand All @@ -57,7 +57,7 @@ alias(

alias(
name = "flate2",
actual = "@crates_vendor__flate2-1.0.33//:flate2",
actual = "@crates_vendor__flate2-1.0.34//:flate2",
tags = ["manual"],
)

Expand All @@ -81,7 +81,7 @@ alias(

alias(
name = "serde_json",
actual = "@crates_vendor__serde_json-1.0.128//:serde_json",
actual = "@crates_vendor__serde_json-1.0.129//:serde_json",
tags = ["manual"],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "0.20.1",
version = "0.20.2",
)
6 changes: 3 additions & 3 deletions deps/rust/crates/BUILD.capnpc-0.20.0.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ rust_library(
],
version = "0.20.0",
deps = [
"@crates_vendor__capnp-0.20.1//:capnp",
"@crates_vendor__capnp-0.20.2//:capnp",
],
)

Expand Down Expand Up @@ -83,7 +83,7 @@ rust_binary(
version = "0.20.0",
deps = [
":capnpc",
"@crates_vendor__capnp-0.20.1//:capnp",
"@crates_vendor__capnp-0.20.2//:capnp",
],
)

Expand Down Expand Up @@ -120,6 +120,6 @@ rust_binary(
version = "0.20.0",
deps = [
":capnpc",
"@crates_vendor__capnp-0.20.1//:capnp",
"@crates_vendor__capnp-0.20.2//:capnp",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.1.21",
version = "1.1.30",
deps = [
"@crates_vendor__shlex-1.3.0//:shlex",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/rust/crates/BUILD.cssparser-0.27.2.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cargo_build_script(
version = "0.27.2",
visibility = ["//visibility:private"],
deps = [
"@crates_vendor__proc-macro2-1.0.86//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.88//:proc_macro2",
"@crates_vendor__quote-1.0.37//:quote",
"@crates_vendor__syn-1.0.109//:syn",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/rust/crates/BUILD.cssparser-macros-0.6.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ rust_proc_macro(
version = "0.6.1",
deps = [
"@crates_vendor__quote-1.0.37//:quote",
"@crates_vendor__syn-2.0.77//:syn",
"@crates_vendor__syn-2.0.79//:syn",
],
)
Loading

0 comments on commit ce91ced

Please sign in to comment.