From 98968ddc586b73d9f1c6b015b44ef01b62d3687f Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 12 Jan 2022 03:24:05 -0800 Subject: [PATCH 1/2] Update rules_rust to latest (with Rust v1.57.0). Signed-off-by: Piotr Sikora --- bazel/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 8ac679bab..fc8ad8c39 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -90,9 +90,9 @@ def proxy_wasm_cpp_host_repositories(): http_archive( name = "rules_rust", - sha256 = "d195a85d38ee2dd7aecfedba6c9814a2ff22f968abac0818fd91e35c5b7aca6f", - strip_prefix = "rules_rust-6f79458dee68d691d6a5aee67b06a620bdf9293f", - url = "https://github.com/bazelbuild/rules_rust/archive/6f79458dee68d691d6a5aee67b06a620bdf9293f.tar.gz", + sha256 = "8a2052e8ec707aa04a6b9e72bfc67fea44e915ecab1d2d0a4835ad51c2410c36", + strip_prefix = "rules_rust-b16c26ba5faf1c58ebe94582afd20567ce676e6d", + url = "https://github.com/bazelbuild/rules_rust/archive/b16c26ba5faf1c58ebe94582afd20567ce676e6d.tar.gz", ) http_archive( From ad375b066a2d6b1ba37b27ff29af2b38c3c9471c Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 12 Jan 2022 04:00:27 -0800 Subject: [PATCH 2/2] review: use @rules_rust//rust:defs.bzl. Signed-off-by: Piotr Sikora --- bazel/external/wasmtime.BUILD | 5 ++--- bazel/wasm.bzl | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bazel/external/wasmtime.BUILD b/bazel/external/wasmtime.BUILD index fda981850..913b6cc35 100644 --- a/bazel/external/wasmtime.BUILD +++ b/bazel/external/wasmtime.BUILD @@ -1,16 +1,15 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@rules_rust//rust:rust.bzl", "rust_library") +load("@rules_rust//rust:defs.bzl", "rust_static_library") licenses(["notice"]) # Apache 2 package(default_visibility = ["//visibility:public"]) -rust_library( +rust_static_library( name = "rust_c_api", srcs = glob(["crates/c-api/src/**/*.rs"]), crate_features = [], crate_root = "crates/c-api/src/lib.rs", - crate_type = "staticlib", edition = "2018", proc_macro_deps = [ "@proxy_wasm_cpp_host//bazel/cargo:wasmtime_c_api_macros", diff --git a/bazel/wasm.bzl b/bazel/wasm.bzl index 8bc3351bf..7a62ccc87 100644 --- a/bazel/wasm.bzl +++ b/bazel/wasm.bzl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_rust//rust:rust.bzl", "rust_binary") +load("@rules_rust//rust:defs.bzl", "rust_binary") def _wasm_rust_transition_impl(settings, attr): return {