diff --git a/bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel b/bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel index f012fba6..ad219ba4 100644 --- a/bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel +++ b/bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel @@ -73,12 +73,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel b/bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel index e17c6c74..fc1d8984 100644 --- a/bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel +++ b/bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel @@ -70,12 +70,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.foldhash-0.2.0.bazel b/bazel/cargo/remote/BUILD.foldhash-0.2.0.bazel index e31fe521..5565754b 100644 --- a/bazel/cargo/remote/BUILD.foldhash-0.2.0.bazel +++ b/bazel/cargo/remote/BUILD.foldhash-0.2.0.bazel @@ -70,12 +70,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.hashbrown-0.16.0.bazel b/bazel/cargo/remote/BUILD.hashbrown-0.16.0.bazel index f3d5775d..97f1dd73 100644 --- a/bazel/cargo/remote/BUILD.hashbrown-0.16.0.bazel +++ b/bazel/cargo/remote/BUILD.hashbrown-0.16.0.bazel @@ -78,12 +78,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.log-0.4.27.bazel b/bazel/cargo/remote/BUILD.log-0.4.27.bazel index dbfcf020..cafd9011 100644 --- a/bazel/cargo/remote/BUILD.log-0.4.27.bazel +++ b/bazel/cargo/remote/BUILD.log-0.4.27.bazel @@ -70,12 +70,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.mockalloc-0.1.2.bazel b/bazel/cargo/remote/BUILD.mockalloc-0.1.2.bazel index 0382acd5..ce280306 100644 --- a/bazel/cargo/remote/BUILD.mockalloc-0.1.2.bazel +++ b/bazel/cargo/remote/BUILD.mockalloc-0.1.2.bazel @@ -73,12 +73,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.mockalloc-macros-0.1.0.bazel b/bazel/cargo/remote/BUILD.mockalloc-macros-0.1.0.bazel index 70ab9d81..191e1033 100644 --- a/bazel/cargo/remote/BUILD.mockalloc-macros-0.1.0.bazel +++ b/bazel/cargo/remote/BUILD.mockalloc-macros-0.1.0.bazel @@ -70,12 +70,16 @@ rust_proc_macro( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.proc-macro2-1.0.101.bazel b/bazel/cargo/remote/BUILD.proc-macro2-1.0.101.bazel index 51c8d72d..1f3ee986 100644 --- a/bazel/cargo/remote/BUILD.proc-macro2-1.0.101.bazel +++ b/bazel/cargo/remote/BUILD.proc-macro2-1.0.101.bazel @@ -78,12 +78,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.quote-1.0.41.bazel b/bazel/cargo/remote/BUILD.quote-1.0.41.bazel index 2576b03c..83d6772b 100644 --- a/bazel/cargo/remote/BUILD.quote-1.0.41.bazel +++ b/bazel/cargo/remote/BUILD.quote-1.0.41.bazel @@ -78,12 +78,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.syn-1.0.109.bazel b/bazel/cargo/remote/BUILD.syn-1.0.109.bazel index 057bf1d9..24fa8d04 100644 --- a/bazel/cargo/remote/BUILD.syn-1.0.109.bazel +++ b/bazel/cargo/remote/BUILD.syn-1.0.109.bazel @@ -84,12 +84,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/BUILD.unicode-ident-1.0.19.bazel b/bazel/cargo/remote/BUILD.unicode-ident-1.0.19.bazel index c60baf29..1c86a804 100644 --- a/bazel/cargo/remote/BUILD.unicode-ident-1.0.19.bazel +++ b/bazel/cargo/remote/BUILD.unicode-ident-1.0.19.bazel @@ -70,12 +70,16 @@ rust_library( "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], + "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], "@rules_rust//rust/platform:thumbv7em-none-eabi": [], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], "@rules_rust//rust/platform:wasm32-unknown-unknown": [], "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], "@rules_rust//rust/platform:x86_64-apple-darwin": [], "@rules_rust//rust/platform:x86_64-apple-ios": [], "@rules_rust//rust/platform:x86_64-linux-android": [], diff --git a/bazel/cargo/remote/defs.bzl b/bazel/cargo/remote/defs.bzl index 9587c7f8..5255992b 100644 --- a/bazel/cargo/remote/defs.bzl +++ b/bazel/cargo/remote/defs.bzl @@ -386,12 +386,16 @@ _CONDITIONS = { "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"], "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"], "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"], + "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"], "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"], "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"], "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"], "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"], + "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"], "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"], "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"], + "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"], + "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"], "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"], "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"], "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"], diff --git a/bazel/dependencies_crates.bzl b/bazel/dependencies_crates.bzl index 680cf539..6ad680d8 100644 --- a/bazel/dependencies_crates.bzl +++ b/bazel/dependencies_crates.bzl @@ -17,6 +17,6 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie load("@rules_rust//rust:repositories.bzl", "rust_repositories") def proxy_wasm_rust_sdk_dependencies_crates(): - rust_repositories() + rust_repositories(versions = ["1.90.0"]) crate_universe_dependencies() crate_repositories() diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 68e94e8a..82d5f9ed 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -35,8 +35,8 @@ def proxy_wasm_rust_sdk_repositories(): maybe( http_archive, name = "rules_rust", - sha256 = "53c1bac7ec48f7ce48c4c1c6aa006f27515add2aeb05725937224e6e00ec7cea", - url = "https://github.com/bazelbuild/rules_rust/releases/download/0.61.0/rules_rust-0.61.0.tar.gz", + sha256 = "dc287e3eca80b29d5cc95e261cae273eedf1af4a00a96ae937e234534dadb24c", + url = "https://github.com/bazelbuild/rules_rust/releases/download/0.67.0/rules_rust-0.67.0.tar.gz", patches = ["//bazel:rules_rust.patch"], patch_args = ["-p1"], ) diff --git a/bazel/rules_rust.patch b/bazel/rules_rust.patch index fab21386..901a88a5 100644 --- a/bazel/rules_rust.patch +++ b/bazel/rules_rust.patch @@ -4,10 +4,10 @@ diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl index 20a09f94..53122967 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl -@@ -1518,7 +1518,7 @@ def rustc_compile_action( - }) - crate_info = rust_common.create_crate_info(**crate_info_dict) - +@@ -1612,7 +1612,7 @@ def rustc_compile_action( + **crate_info_dict + ) + - if crate_info.type in ["staticlib", "cdylib"]: + if crate_info.type in ["staticlib", "cdylib"] and not out_binary: # These rules are not supposed to be depended on by other rust targets, and