Skip to content

deps: upgrade rules_rust to v0.60 #39216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def _go_deps(skip_targets):
def _rust_deps():
external_http_archive(
"rules_rust",
patches = ["@envoy//bazel:rules_rust.patch", "@envoy//bazel:rules_rust_ppc64le.patch"],
patches = ["@envoy//bazel:rules_rust.patch"],
)

def envoy_dependencies(skip_targets = []):
Expand Down
4 changes: 2 additions & 2 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1444,8 +1444,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Bazel rust rules",
project_desc = "Bazel rust rules (used by Wasm)",
project_url = "https://github.com/bazelbuild/rules_rust",
version = "0.56.0",
sha256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64",
version = "0.60.0",
sha256 = "7825214ccad7c2482cb490ac91dbc1e88b30223062796ce328aca893b74ae342",
Comment on lines +1447 to +1448
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requires release date change release_date = "2025-08-08",

# Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.
# This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap
# is required which in turn requires a system CC toolchains, not the bazel controlled ones.
Expand Down
61 changes: 0 additions & 61 deletions bazel/rules_rust_ppc64le.patch

This file was deleted.

162 changes: 49 additions & 113 deletions source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "c0d467a39180d065453586687649d169eafc9222d6c3352463a214d2b1b6cf84",
"checksum": "1bdc96d50ba35f35dc1a020cecb49f1d48780b0a4677dc947e065f7be5e91563",
"crates": {
"aho-corasick 1.1.3": {
"name": "aho-corasick",
Expand Down Expand Up @@ -200,6 +200,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
],
Expand Down Expand Up @@ -433,6 +436,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
],
Expand Down Expand Up @@ -593,6 +599,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
],
Expand Down Expand Up @@ -794,6 +803,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -1136,6 +1148,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -1419,6 +1434,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
],
Expand Down Expand Up @@ -1499,6 +1517,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2120,6 +2141,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2188,6 +2212,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2256,6 +2283,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2324,6 +2354,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2392,6 +2425,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2460,6 +2496,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2528,6 +2567,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand Down Expand Up @@ -2596,6 +2638,9 @@
"compile_data_glob": [
"**"
],
"compile_data_glob_excludes": [
"**/*.rs"
],
"data_glob": [
"**"
]
Expand All @@ -2616,154 +2661,45 @@
"aarch64-apple-darwin": [
"aarch64-apple-darwin"
],
"aarch64-apple-ios": [
"aarch64-apple-ios"
],
"aarch64-apple-ios-sim": [
"aarch64-apple-ios-sim"
],
"aarch64-linux-android": [
"aarch64-linux-android"
],
"aarch64-pc-windows-gnullvm": [],
"aarch64-pc-windows-msvc": [
"aarch64-pc-windows-msvc"
],
"aarch64-unknown-fuchsia": [
"aarch64-unknown-fuchsia"
],
"aarch64-unknown-linux-gnu": [
"aarch64-unknown-linux-gnu"
],
"aarch64-unknown-nixos-gnu": [
"aarch64-unknown-nixos-gnu"
],
"aarch64-unknown-nto-qnx710": [
"aarch64-unknown-nto-qnx710"
],
"arm-unknown-linux-gnueabi": [
"arm-unknown-linux-gnueabi"
],
"armv7-linux-androideabi": [
"armv7-linux-androideabi"
],
"armv7-unknown-linux-gnueabi": [
"armv7-unknown-linux-gnueabi"
],
"cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": [
"x86_64-pc-windows-msvc"
],
"cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": [
"aarch64-pc-windows-msvc"
],
"cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": [
"i686-unknown-linux-gnu"
],
"cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": [
"i686-pc-windows-msvc"
],
"cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": [],
"cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": [],
"cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": [],
"cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": [
"x86_64-unknown-linux-gnu",
"x86_64-unknown-nixos-gnu"
],
"cfg(unix)": [
"aarch64-apple-darwin",
"aarch64-apple-ios",
"aarch64-apple-ios-sim",
"aarch64-linux-android",
"aarch64-unknown-fuchsia",
"aarch64-unknown-linux-gnu",
"aarch64-unknown-nixos-gnu",
"aarch64-unknown-nto-qnx710",
"arm-unknown-linux-gnueabi",
"armv7-linux-androideabi",
"armv7-unknown-linux-gnueabi",
"i686-apple-darwin",
"i686-linux-android",
"i686-unknown-freebsd",
"i686-unknown-linux-gnu",
"powerpc-unknown-linux-gnu",
"s390x-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-linux-android",
"x86_64-unknown-freebsd",
"x86_64-unknown-fuchsia",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-nixos-gnu"
],
"cfg(windows)": [
"aarch64-pc-windows-msvc",
"i686-pc-windows-msvc",
"x86_64-pc-windows-msvc"
],
"i686-apple-darwin": [
"i686-apple-darwin"
],
"i686-linux-android": [
"i686-linux-android"
],
"i686-pc-windows-gnullvm": [],
"i686-pc-windows-msvc": [
"i686-pc-windows-msvc"
],
"i686-unknown-freebsd": [
"i686-unknown-freebsd"
],
"i686-unknown-linux-gnu": [
"i686-unknown-linux-gnu"
],
"powerpc-unknown-linux-gnu": [
"powerpc-unknown-linux-gnu"
],
"riscv32imc-unknown-none-elf": [
"riscv32imc-unknown-none-elf"
],
"riscv64gc-unknown-none-elf": [
"riscv64gc-unknown-none-elf"
],
"s390x-unknown-linux-gnu": [
"s390x-unknown-linux-gnu"
],
"thumbv7em-none-eabi": [
"thumbv7em-none-eabi"
],
"thumbv8m.main-none-eabi": [
"thumbv8m.main-none-eabi"
],
"wasm32-unknown-unknown": [
"wasm32-unknown-unknown"
],
"wasm32-wasip1": [
"wasm32-wasip1"
],
"x86_64-apple-darwin": [
"x86_64-apple-darwin"
],
"x86_64-apple-ios": [
"x86_64-apple-ios"
],
"x86_64-linux-android": [
"x86_64-linux-android"
],
"x86_64-pc-windows-gnullvm": [],
"x86_64-pc-windows-msvc": [
"x86_64-pc-windows-msvc"
],
"x86_64-unknown-freebsd": [
"x86_64-unknown-freebsd"
],
"x86_64-unknown-fuchsia": [
"x86_64-unknown-fuchsia"
],
"x86_64-unknown-linux-gnu": [
"x86_64-unknown-linux-gnu"
],
"x86_64-unknown-nixos-gnu": [
"x86_64-unknown-nixos-gnu"
],
"x86_64-unknown-none": [
"x86_64-unknown-none"
]
},
"direct_deps": [
Expand Down