diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 465f8f55a0f03..6a3a048d3cb02 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -112,7 +112,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 = []): diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 18a626a280e20..faf163b2cc647 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1564,8 +1564,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.59.2", + sha256 = "09e17b47c0150465631aa319f2742760a43ededab2e9c012f91d0ae2eff02268", # 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. @@ -1576,7 +1576,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "dataplane_ext", ], extensions = ["envoy.wasm.runtime.wasmtime"], - release_date = "2024-12-16", + release_date = "2025-03-20", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt", diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock index d3bcae06f9c6a..a588d3f895e4d 100644 --- a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock +++ b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock @@ -1,5 +1,5 @@ { - "checksum": "c0d467a39180d065453586687649d169eafc9222d6c3352463a214d2b1b6cf84", + "checksum": "bd431f32c79a519c947fff0a3e4f20d071fddac8b632dcd5652e7821b3c603ae", "crates": { "aho-corasick 1.1.3": { "name": "aho-corasick", @@ -200,6 +200,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ], @@ -433,6 +436,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ], @@ -593,6 +599,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ], @@ -794,6 +803,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -1136,6 +1148,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -1419,6 +1434,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ], @@ -1499,6 +1517,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2120,6 +2141,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2188,6 +2212,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2256,6 +2283,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2324,6 +2354,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2392,6 +2425,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2460,6 +2496,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2528,6 +2567,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -2596,6 +2638,9 @@ "compile_data_glob": [ "**" ], + "compile_data_glob_excludes": [ + "**/*.rs" + ], "data_glob": [ "**" ] @@ -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": [