Skip to content

Commit aa62f10

Browse files
committed
[bazel] Move rules_rust back to WORKSPACE to fix zstd compilation
1 parent 88b7a1f commit aa62f10

File tree

2 files changed

+28
-15
lines changed

2 files changed

+28
-15
lines changed

MODULE.bazel

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ bazel_dep(name = "rules_pkg", version = "0.9.1")
1919
bazel_dep(name = "rules_python", version = "0.31.0")
2020
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
2121
bazel_dep(name = "rules_ruby", version = "0.8.1")
22-
bazel_dep(name = "rules_rust", version = "0.42.1")
2322

2423
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
2524
linter.configure(
@@ -322,20 +321,6 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
322321

323322
register_toolchains("@ruby_toolchains//:all")
324323

325-
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
326-
rust.toolchain()
327-
use_repo(rust, "rust_toolchains")
328-
329-
register_toolchains("@rust_toolchains//:all")
330-
331-
crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
332-
crate.from_cargo(
333-
name = "crates",
334-
cargo_lockfile = "//rust:Cargo.lock",
335-
manifests = ["//rust:Cargo.toml"],
336-
)
337-
use_repo(crate, "crates")
338-
339324
selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
340325
use_repo(
341326
selenium_manager_artifacts,

WORKSPACE

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,31 @@ load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_depende
3232
rules_closure_dependencies()
3333

3434
rules_closure_toolchains()
35+
36+
# rules_rust fails to compile zstd on Windows when used with Bzlmod
37+
# so we keep it in WORKSPACE for now
38+
39+
http_archive(
40+
name = "rules_rust",
41+
integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=",
42+
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz"],
43+
)
44+
45+
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
46+
47+
rules_rust_dependencies()
48+
49+
rust_register_toolchains()
50+
51+
load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
52+
53+
crates_repository(
54+
name = "crates",
55+
cargo_lockfile = "//rust:Cargo.lock",
56+
lockfile = "//rust:Cargo.Bazel.lock",
57+
manifests = ["//rust:Cargo.toml"],
58+
)
59+
60+
load("@crates//:defs.bzl", "crate_repositories")
61+
62+
crate_repositories()

0 commit comments

Comments
 (0)