diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 11de901a..e17f91d3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -80,8 +80,7 @@ jobs: run: | go install github.com/bazelbuild/buildtools/buildifier@latest export PATH=$PATH:$(go env GOPATH)/bin - buildifier -mode=check WORKSPACE - buildifier -mode=check BUILD + buildifier -mode=check -r . - name: Format (rules_rust) run: | diff --git a/bazel/BUILD b/bazel/BUILD index bb488a81..6d6d1266 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -11,4 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - diff --git a/bazel/dependencies.bzl b/bazel/dependencies.bzl index 646fe2d8..ec69cafa 100644 --- a/bazel/dependencies.bzl +++ b/bazel/dependencies.bzl @@ -13,8 +13,8 @@ # limitations under the License. load("@proxy_wasm_rust_sdk//bazel/cargo/remote:defs.bzl", "crate_repositories") -load("@rules_rust//rust:repositories.bzl", "rust_repositories") load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") +load("@rules_rust//rust:repositories.bzl", "rust_repositories") def proxy_wasm_rust_sdk_dependencies(): rust_repositories() diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index c02bf0af..860f6344 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -26,8 +26,8 @@ def proxy_wasm_rust_sdk_repositories(): maybe( http_archive, name = "rules_rust", - sha256 = "df973075339aaaabb8cbe697808514d82d8f00a333e3ebb227bfd4308182985b", - url = "https://github.com/bazelbuild/rules_rust/releases/download/0.47.1/rules_rust-v0.47.1.tar.gz", + sha256 = "85e2013727ab26fb22abdffe4b2ac0c27a2d5b6296167ba63d8f6e13140f51f9", + url = "https://github.com/bazelbuild/rules_rust/releases/download/0.53.0/rules_rust-v0.53.0.tar.gz", patches = ["//bazel:rules_rust.patch"], patch_args = ["-p1"], ) diff --git a/bazel/rules_rust.patch b/bazel/rules_rust.patch index c494f262..fab21386 100644 --- a/bazel/rules_rust.patch +++ b/bazel/rules_rust.patch @@ -1,10 +1,10 @@ # https://github.com/bazelbuild/rules_rust/pull/1315 diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl -index eff542eb..9efe645c 100644 +index 20a09f94..53122967 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl -@@ -1467,7 +1467,7 @@ def rustc_compile_action( +@@ -1518,7 +1518,7 @@ def rustc_compile_action( }) crate_info = rust_common.create_crate_info(**crate_info_dict)