From 1c424b5ab8be0b610a4abe1831ee0fb4b29dc632 Mon Sep 17 00:00:00 2001 From: Nicholas Paun Date: Thu, 9 Jan 2025 10:18:41 -0800 Subject: [PATCH] Update deps (lol-html, clang-format, wpt) (#3312) --- build/deps/build_deps.jsonc | 12 +- deps/rust/Cargo.lock | 78 +++---------- deps/rust/cargo.bzl | 6 +- ...7.2.bazel => BUILD.cssparser-0.29.6.bazel} | 8 +- deps/rust/crates/BUILD.itoa-0.4.8.bazel | 48 -------- .../rust/crates/BUILD.lazy_static-1.5.0.bazel | 44 -------- deps/rust/crates/BUILD.lazycell-1.3.0.bazel | 44 -------- ...2.1.0.bazel => BUILD.lol_html-2.2.0.bazel} | 10 +- .../crates/BUILD.lol_html_c_api-1.1.2.bazel | 12 +- ...2.0.bazel => BUILD.selectors-0.24.0.bazel} | 12 +- ....1.1.bazel => BUILD.servo_arc-0.2.0.bazel} | 2 +- deps/rust/crates/BUILD.thin-slice-0.1.1.bazel | 44 -------- deps/rust/crates/BUILD.thiserror-1.0.69.bazel | 106 ------------------ .../crates/BUILD.thiserror-impl-1.0.69.bazel | 49 -------- deps/rust/crates/defs.bzl | 98 ++++------------ 15 files changed, 68 insertions(+), 505 deletions(-) rename deps/rust/crates/{BUILD.cssparser-0.27.2.bazel => BUILD.cssparser-0.29.6.bazel} (94%) delete mode 100644 deps/rust/crates/BUILD.itoa-0.4.8.bazel delete mode 100644 deps/rust/crates/BUILD.lazy_static-1.5.0.bazel delete mode 100644 deps/rust/crates/BUILD.lazycell-1.3.0.bazel rename deps/rust/crates/{BUILD.lol_html-2.1.0.bazel => BUILD.lol_html-2.2.0.bazel} (82%) rename deps/rust/crates/{BUILD.selectors-0.22.0.bazel => BUILD.selectors-0.24.0.bazel} (89%) rename deps/rust/crates/{BUILD.servo_arc-0.1.1.bazel => BUILD.servo_arc-0.2.0.bazel} (98%) delete mode 100644 deps/rust/crates/BUILD.thin-slice-0.1.1.bazel delete mode 100644 deps/rust/crates/BUILD.thiserror-1.0.69.bazel delete mode 100644 deps/rust/crates/BUILD.thiserror-impl-1.0.69.bazel diff --git a/build/deps/build_deps.jsonc b/build/deps/build_deps.jsonc index 97b1ba10979..6d6631ce3d4 100644 --- a/build/deps/build_deps.jsonc +++ b/build/deps/build_deps.jsonc @@ -177,7 +177,8 @@ "owner": "cloudflare", "repo": "workerd-tools", "file_regex": "llvm-.*-linux-amd64-clang-format", - "file_type": "executable" + "file_type": "executable", + "freeze_version": "llvm-18.1.8" }, { "name": "clang-format-linux-arm64", @@ -185,7 +186,8 @@ "owner": "cloudflare", "repo": "workerd-tools", "file_regex": "llvm-.*-linux-arm64-clang-format", - "file_type": "executable" + "file_type": "executable", + "freeze_version": "llvm-18.1.8" }, { "name": "clang-format-darwin-arm64", @@ -193,7 +195,8 @@ "owner": "cloudflare", "repo": "workerd-tools", "file_regex": "llvm-.*-darwin-arm64-clang-format", - "file_type": "executable" + "file_type": "executable", + "freeze_version": "llvm-18.1.8" }, //ruff { @@ -227,7 +230,8 @@ "owner": "cloudflare", "repo": "workerd-tools", "file_regex": "wpt-.*.tar.gz", - "build_file": "//:build/BUILD.wpt" + "build_file": "//:build/BUILD.wpt", + "freeze_version": "wpt-af83b77e2" } ] } diff --git a/deps/rust/Cargo.lock b/deps/rust/Cargo.lock index 778835acebe..4d9229c5992 100644 --- a/deps/rust/Cargo.lock +++ b/deps/rust/Cargo.lock @@ -203,13 +203,13 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.27.2" +version = "0.29.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" dependencies = [ "cssparser-macros", "dtoa-short", - "itoa 0.4.8", + "itoa", "matches", "phf 0.8.0", "proc-macro2", @@ -309,7 +309,7 @@ dependencies = [ "serde", "serde_json", "syn 2.0.90", - "thiserror 2.0.6", + "thiserror", "tokio", "tracing", ] @@ -456,30 +456,12 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.168" @@ -503,31 +485,29 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lol_html" -version = "2.1.0" -source = "git+https://github.com/cloudflare/lol-html.git?rev=cac9f2f59aea8ad803286b0aae0d667926f441c7#cac9f2f59aea8ad803286b0aae0d667926f441c7" +version = "2.2.0" +source = "git+https://github.com/cloudflare/lol-html.git?tag=v2.2.0#67f1d4ffd6b74db7e053fb129dcce620193c180d" dependencies = [ "bitflags 2.6.0", "cfg-if", "cssparser", "encoding_rs", "hashbrown", - "lazy_static", - "lazycell", "memchr", "mime", "selectors", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "lol_html_c_api" version = "1.1.2" -source = "git+https://github.com/cloudflare/lol-html.git?rev=cac9f2f59aea8ad803286b0aae0d667926f441c7#cac9f2f59aea8ad803286b0aae0d667926f441c7" +source = "git+https://github.com/cloudflare/lol-html.git?tag=v2.2.0#67f1d4ffd6b74db7e053fb129dcce620193c180d" dependencies = [ "encoding_rs", "libc", "lol_html", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -926,22 +906,20 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "selectors" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" dependencies = [ "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", "log", - "matches", "phf 0.8.0", "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", - "thin-slice", ] [[package]] @@ -976,7 +954,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "itoa 1.0.14", + "itoa", "memchr", "ryu", "serde", @@ -984,9 +962,9 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" dependencies = [ "nodrop", "stable_deref_trait", @@ -1069,39 +1047,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.6", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", + "thiserror-impl", ] [[package]] diff --git a/deps/rust/cargo.bzl b/deps/rust/cargo.bzl index b7d40f38304..f63e78a12c3 100644 --- a/deps/rust/cargo.bzl +++ b/deps/rust/cargo.bzl @@ -16,10 +16,8 @@ PACKAGES = { "cxx": crate.spec(version = "1"), "cxxbridge-cmd": crate.spec(version = "1"), "flate2": crate.spec(version = "1"), - # Commit hash refers to lol-html v2.1.0. We then access the nested lol_html_c_api crate within. - # TODO(npaun): The next release of lol-html could change the way we access the nested crate. - # Check once https://github.com/cloudflare/lol-html/pull/247 is in a release. - "lol_html_c_api": crate.spec(git = "https://github.com/cloudflare/lol-html.git", rev = "cac9f2f59aea8ad803286b0aae0d667926f441c7"), + # Tag refers to lol-html v2.2.0. We then access the nested lol_html_c_api crate within. + "lol_html_c_api": crate.spec(git = "https://github.com/cloudflare/lol-html.git", tag = "v2.2.0"), "nix": crate.spec(version = "0"), "pico-args": crate.spec(version = "0"), "proc-macro2": crate.spec(version = "1"), diff --git a/deps/rust/crates/BUILD.cssparser-0.27.2.bazel b/deps/rust/crates/BUILD.cssparser-0.29.6.bazel similarity index 94% rename from deps/rust/crates/BUILD.cssparser-0.27.2.bazel rename to deps/rust/crates/BUILD.cssparser-0.29.6.bazel index 2311a76e067..a80042d6e90 100644 --- a/deps/rust/crates/BUILD.cssparser-0.27.2.bazel +++ b/deps/rust/crates/BUILD.cssparser-0.29.6.bazel @@ -44,11 +44,11 @@ rust_library( "noclippy", "norustfmt", ], - version = "0.27.2", + version = "0.29.6", deps = [ - "@crates_vendor__cssparser-0.27.2//:build_script_build", + "@crates_vendor__cssparser-0.29.6//:build_script_build", "@crates_vendor__dtoa-short-0.3.5//:dtoa_short", - "@crates_vendor__itoa-0.4.8//:itoa", + "@crates_vendor__itoa-1.0.14//:itoa", "@crates_vendor__matches-0.1.10//:matches", "@crates_vendor__phf-0.8.0//:phf", "@crates_vendor__smallvec-1.13.2//:smallvec", @@ -100,7 +100,7 @@ cargo_build_script( "noclippy", "norustfmt", ], - version = "0.27.2", + version = "0.29.6", visibility = ["//visibility:private"], deps = [ "@crates_vendor__proc-macro2-1.0.92//:proc_macro2", diff --git a/deps/rust/crates/BUILD.itoa-0.4.8.bazel b/deps/rust/crates/BUILD.itoa-0.4.8.bazel deleted file mode 100644 index f01e55383d1..00000000000 --- a/deps/rust/crates/BUILD.itoa-0.4.8.bazel +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -rust_library( - name = "itoa", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=itoa", - "manual", - "noclippy", - "norustfmt", - ], - version = "0.4.8", -) diff --git a/deps/rust/crates/BUILD.lazy_static-1.5.0.bazel b/deps/rust/crates/BUILD.lazy_static-1.5.0.bazel deleted file mode 100644 index 7cf0349b19e..00000000000 --- a/deps/rust/crates/BUILD.lazy_static-1.5.0.bazel +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -rust_library( - name = "lazy_static", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=lazy_static", - "manual", - "noclippy", - "norustfmt", - ], - version = "1.5.0", -) diff --git a/deps/rust/crates/BUILD.lazycell-1.3.0.bazel b/deps/rust/crates/BUILD.lazycell-1.3.0.bazel deleted file mode 100644 index e18c0c070e0..00000000000 --- a/deps/rust/crates/BUILD.lazycell-1.3.0.bazel +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -rust_library( - name = "lazycell", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=lazycell", - "manual", - "noclippy", - "norustfmt", - ], - version = "1.3.0", -) diff --git a/deps/rust/crates/BUILD.lol_html-2.1.0.bazel b/deps/rust/crates/BUILD.lol_html-2.2.0.bazel similarity index 82% rename from deps/rust/crates/BUILD.lol_html-2.1.0.bazel rename to deps/rust/crates/BUILD.lol_html-2.2.0.bazel index 2fcc371f091..d39fef14649 100644 --- a/deps/rust/crates/BUILD.lol_html-2.1.0.bazel +++ b/deps/rust/crates/BUILD.lol_html-2.2.0.bazel @@ -40,18 +40,16 @@ rust_library( "noclippy", "norustfmt", ], - version = "2.1.0", + version = "2.2.0", deps = [ "@crates_vendor__bitflags-2.6.0//:bitflags", "@crates_vendor__cfg-if-1.0.0//:cfg_if", - "@crates_vendor__cssparser-0.27.2//:cssparser", + "@crates_vendor__cssparser-0.29.6//:cssparser", "@crates_vendor__encoding_rs-0.8.35//:encoding_rs", "@crates_vendor__hashbrown-0.15.2//:hashbrown", - "@crates_vendor__lazy_static-1.5.0//:lazy_static", - "@crates_vendor__lazycell-1.3.0//:lazycell", "@crates_vendor__memchr-2.7.4//:memchr", "@crates_vendor__mime-0.3.17//:mime", - "@crates_vendor__selectors-0.22.0//:selectors", - "@crates_vendor__thiserror-1.0.69//:thiserror", + "@crates_vendor__selectors-0.24.0//:selectors", + "@crates_vendor__thiserror-2.0.6//:thiserror", ], ) diff --git a/deps/rust/crates/BUILD.lol_html_c_api-1.1.2.bazel b/deps/rust/crates/BUILD.lol_html_c_api-1.1.2.bazel index 9e8f61970eb..227bb7badfc 100644 --- a/deps/rust/crates/BUILD.lol_html_c_api-1.1.2.bazel +++ b/deps/rust/crates/BUILD.lol_html_c_api-1.1.2.bazel @@ -29,6 +29,10 @@ rust_library( "WORKSPACE.bazel", ], ), + crate_features = [ + "capi", + "default", + ], crate_root = "src/lib.rs", edition = "2021", rustc_flags = [ @@ -45,9 +49,9 @@ rust_library( deps = [ "@crates_vendor__encoding_rs-0.8.35//:encoding_rs", "@crates_vendor__libc-0.2.168//:libc", - "@crates_vendor__lol_html-2.1.0//:lol_html", + "@crates_vendor__lol_html-2.2.0//:lol_html", "@crates_vendor__lol_html_c_api-1.1.2//:build_script_build", - "@crates_vendor__thiserror-1.0.69//:thiserror", + "@crates_vendor__thiserror-2.0.6//:thiserror", ], ) @@ -70,6 +74,10 @@ cargo_build_script( "WORKSPACE.bazel", ], ), + crate_features = [ + "capi", + "default", + ], crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/deps/rust/crates/BUILD.selectors-0.22.0.bazel b/deps/rust/crates/BUILD.selectors-0.24.0.bazel similarity index 89% rename from deps/rust/crates/BUILD.selectors-0.22.0.bazel rename to deps/rust/crates/BUILD.selectors-0.24.0.bazel index f82fd32e07b..eed324a6cb5 100644 --- a/deps/rust/crates/BUILD.selectors-0.22.0.bazel +++ b/deps/rust/crates/BUILD.selectors-0.24.0.bazel @@ -44,19 +44,17 @@ rust_library( "noclippy", "norustfmt", ], - version = "0.22.0", + version = "0.24.0", deps = [ "@crates_vendor__bitflags-1.3.2//:bitflags", - "@crates_vendor__cssparser-0.27.2//:cssparser", + "@crates_vendor__cssparser-0.29.6//:cssparser", "@crates_vendor__fxhash-0.2.1//:fxhash", "@crates_vendor__log-0.4.22//:log", - "@crates_vendor__matches-0.1.10//:matches", "@crates_vendor__phf-0.8.0//:phf", "@crates_vendor__precomputed-hash-0.1.1//:precomputed_hash", - "@crates_vendor__selectors-0.22.0//:build_script_build", - "@crates_vendor__servo_arc-0.1.1//:servo_arc", + "@crates_vendor__selectors-0.24.0//:build_script_build", + "@crates_vendor__servo_arc-0.2.0//:servo_arc", "@crates_vendor__smallvec-1.13.2//:smallvec", - "@crates_vendor__thin-slice-0.1.1//:thin_slice", ], ) @@ -105,7 +103,7 @@ cargo_build_script( "noclippy", "norustfmt", ], - version = "0.22.0", + version = "0.24.0", visibility = ["//visibility:private"], deps = [ "@crates_vendor__phf_codegen-0.8.0//:phf_codegen", diff --git a/deps/rust/crates/BUILD.servo_arc-0.1.1.bazel b/deps/rust/crates/BUILD.servo_arc-0.2.0.bazel similarity index 98% rename from deps/rust/crates/BUILD.servo_arc-0.1.1.bazel rename to deps/rust/crates/BUILD.servo_arc-0.2.0.bazel index f15bda2691e..bc27811ea09 100644 --- a/deps/rust/crates/BUILD.servo_arc-0.1.1.bazel +++ b/deps/rust/crates/BUILD.servo_arc-0.2.0.bazel @@ -40,7 +40,7 @@ rust_library( "noclippy", "norustfmt", ], - version = "0.1.1", + version = "0.2.0", deps = [ "@crates_vendor__nodrop-0.1.14//:nodrop", "@crates_vendor__stable_deref_trait-1.2.0//:stable_deref_trait", diff --git a/deps/rust/crates/BUILD.thin-slice-0.1.1.bazel b/deps/rust/crates/BUILD.thin-slice-0.1.1.bazel deleted file mode 100644 index adc601a8a53..00000000000 --- a/deps/rust/crates/BUILD.thin-slice-0.1.1.bazel +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -rust_library( - name = "thin_slice", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=thin-slice", - "manual", - "noclippy", - "norustfmt", - ], - version = "0.1.1", -) diff --git a/deps/rust/crates/BUILD.thiserror-1.0.69.bazel b/deps/rust/crates/BUILD.thiserror-1.0.69.bazel deleted file mode 100644 index ab6aa1c6729..00000000000 --- a/deps/rust/crates/BUILD.thiserror-1.0.69.bazel +++ /dev/null @@ -1,106 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_build_script") -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -rust_library( - name = "thiserror", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2021", - proc_macro_deps = [ - "@crates_vendor__thiserror-impl-1.0.69//:thiserror_impl", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=thiserror", - "manual", - "noclippy", - "norustfmt", - ], - version = "1.0.69", - deps = [ - "@crates_vendor__thiserror-1.0.69//:build_script_build", - ], -) - -cargo_build_script( - name = "_bs", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - "**/*.rs", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_name = "build_script_build", - crate_root = "build.rs", - data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - edition = "2021", - pkg_name = "thiserror", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=thiserror", - "manual", - "noclippy", - "norustfmt", - ], - version = "1.0.69", - visibility = ["//visibility:private"], -) - -alias( - name = "build_script_build", - actual = ":_bs", - tags = ["manual"], -) diff --git a/deps/rust/crates/BUILD.thiserror-impl-1.0.69.bazel b/deps/rust/crates/BUILD.thiserror-impl-1.0.69.bazel deleted file mode 100644 index 3c241673aa4..00000000000 --- a/deps/rust/crates/BUILD.thiserror-impl-1.0.69.bazel +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//deps/rust:crates_vendor -############################################################################### - -load("@rules_rust//rust:defs.bzl", "rust_proc_macro") - -package(default_visibility = ["//visibility:public"]) - -rust_proc_macro( - name = "thiserror_impl", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2021", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=thiserror-impl", - "manual", - "noclippy", - "norustfmt", - ], - version = "1.0.69", - deps = [ - "@crates_vendor__proc-macro2-1.0.92//:proc_macro2", - "@crates_vendor__quote-1.0.37//:quote", - "@crates_vendor__syn-2.0.90//:syn", - ], -) diff --git a/deps/rust/crates/defs.bzl b/deps/rust/crates/defs.bzl index 9b7574745b7..d312f5a8b56 100644 --- a/deps/rust/crates/defs.bzl +++ b/deps/rust/crates/defs.bzl @@ -652,12 +652,12 @@ def crate_repositories(): maybe( http_archive, - name = "crates_vendor__cssparser-0.27.2", - sha256 = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a", + name = "crates_vendor__cssparser-0.29.6", + sha256 = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa", type = "tar.gz", - urls = ["https://static.crates.io/crates/cssparser/0.27.2/download"], - strip_prefix = "cssparser-0.27.2", - build_file = Label("@workerd//deps/rust/crates:BUILD.cssparser-0.27.2.bazel"), + urls = ["https://static.crates.io/crates/cssparser/0.29.6/download"], + strip_prefix = "cssparser-0.29.6", + build_file = Label("@workerd//deps/rust/crates:BUILD.cssparser-0.29.6.bazel"), ) maybe( @@ -880,16 +880,6 @@ def crate_repositories(): build_file = Label("@workerd//deps/rust/crates:BUILD.itertools-0.13.0.bazel"), ) - maybe( - http_archive, - name = "crates_vendor__itoa-0.4.8", - sha256 = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4", - type = "tar.gz", - urls = ["https://static.crates.io/crates/itoa/0.4.8/download"], - strip_prefix = "itoa-0.4.8", - build_file = Label("@workerd//deps/rust/crates:BUILD.itoa-0.4.8.bazel"), - ) - maybe( http_archive, name = "crates_vendor__itoa-1.0.14", @@ -900,26 +890,6 @@ def crate_repositories(): build_file = Label("@workerd//deps/rust/crates:BUILD.itoa-1.0.14.bazel"), ) - maybe( - http_archive, - name = "crates_vendor__lazy_static-1.5.0", - sha256 = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe", - type = "tar.gz", - urls = ["https://static.crates.io/crates/lazy_static/1.5.0/download"], - strip_prefix = "lazy_static-1.5.0", - build_file = Label("@workerd//deps/rust/crates:BUILD.lazy_static-1.5.0.bazel"), - ) - - maybe( - http_archive, - name = "crates_vendor__lazycell-1.3.0", - sha256 = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55", - type = "tar.gz", - urls = ["https://static.crates.io/crates/lazycell/1.3.0/download"], - strip_prefix = "lazycell-1.3.0", - build_file = Label("@workerd//deps/rust/crates:BUILD.lazycell-1.3.0.bazel"), - ) - maybe( http_archive, name = "crates_vendor__libc-0.2.168", @@ -952,17 +922,17 @@ def crate_repositories(): maybe( new_git_repository, - name = "crates_vendor__lol_html-2.1.0", - commit = "cac9f2f59aea8ad803286b0aae0d667926f441c7", + name = "crates_vendor__lol_html-2.2.0", + commit = "67f1d4ffd6b74db7e053fb129dcce620193c180d", init_submodules = True, remote = "https://github.com/cloudflare/lol-html.git", - build_file = Label("@workerd//deps/rust/crates:BUILD.lol_html-2.1.0.bazel"), + build_file = Label("@workerd//deps/rust/crates:BUILD.lol_html-2.2.0.bazel"), ) maybe( new_git_repository, name = "crates_vendor__lol_html_c_api-1.1.2", - commit = "cac9f2f59aea8ad803286b0aae0d667926f441c7", + commit = "67f1d4ffd6b74db7e053fb129dcce620193c180d", init_submodules = True, remote = "https://github.com/cloudflare/lol-html.git", build_file = Label("@workerd//deps/rust/crates:BUILD.lol_html_c_api-1.1.2.bazel"), @@ -1411,12 +1381,12 @@ def crate_repositories(): maybe( http_archive, - name = "crates_vendor__selectors-0.22.0", - sha256 = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe", + name = "crates_vendor__selectors-0.24.0", + sha256 = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416", type = "tar.gz", - urls = ["https://static.crates.io/crates/selectors/0.22.0/download"], - strip_prefix = "selectors-0.22.0", - build_file = Label("@workerd//deps/rust/crates:BUILD.selectors-0.22.0.bazel"), + urls = ["https://static.crates.io/crates/selectors/0.24.0/download"], + strip_prefix = "selectors-0.24.0", + build_file = Label("@workerd//deps/rust/crates:BUILD.selectors-0.24.0.bazel"), ) maybe( @@ -1461,12 +1431,12 @@ def crate_repositories(): maybe( http_archive, - name = "crates_vendor__servo_arc-0.1.1", - sha256 = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432", + name = "crates_vendor__servo_arc-0.2.0", + sha256 = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741", type = "tar.gz", - urls = ["https://static.crates.io/crates/servo_arc/0.1.1/download"], - strip_prefix = "servo_arc-0.1.1", - build_file = Label("@workerd//deps/rust/crates:BUILD.servo_arc-0.1.1.bazel"), + urls = ["https://static.crates.io/crates/servo_arc/0.2.0/download"], + strip_prefix = "servo_arc-0.2.0", + build_file = Label("@workerd//deps/rust/crates:BUILD.servo_arc-0.2.0.bazel"), ) maybe( @@ -1569,26 +1539,6 @@ def crate_repositories(): build_file = Label("@workerd//deps/rust/crates:BUILD.termcolor-1.4.1.bazel"), ) - maybe( - http_archive, - name = "crates_vendor__thin-slice-0.1.1", - sha256 = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c", - type = "tar.gz", - urls = ["https://static.crates.io/crates/thin-slice/0.1.1/download"], - strip_prefix = "thin-slice-0.1.1", - build_file = Label("@workerd//deps/rust/crates:BUILD.thin-slice-0.1.1.bazel"), - ) - - maybe( - http_archive, - name = "crates_vendor__thiserror-1.0.69", - sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52", - type = "tar.gz", - urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"], - strip_prefix = "thiserror-1.0.69", - build_file = Label("@workerd//deps/rust/crates:BUILD.thiserror-1.0.69.bazel"), - ) - maybe( http_archive, name = "crates_vendor__thiserror-2.0.6", @@ -1599,16 +1549,6 @@ def crate_repositories(): build_file = Label("@workerd//deps/rust/crates:BUILD.thiserror-2.0.6.bazel"), ) - maybe( - http_archive, - name = "crates_vendor__thiserror-impl-1.0.69", - sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1", - type = "tar.gz", - urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"], - strip_prefix = "thiserror-impl-1.0.69", - build_file = Label("@workerd//deps/rust/crates:BUILD.thiserror-impl-1.0.69.bazel"), - ) - maybe( http_archive, name = "crates_vendor__thiserror-impl-2.0.6",