Skip to content

Commit

Permalink
fix: use non overriden rust rules in MODULE
Browse files Browse the repository at this point in the history
  • Loading branch information
opicaud committed Aug 22, 2023
1 parent 00c1785 commit 63e13e3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 43 deletions.
4 changes: 3 additions & 1 deletion rust/.bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
build --enable_bzlmod
build --enable_bzlmod
common --registry=https://bcr.bazel.build
common --registry=https://raw.githubusercontent.com/matts1/bazel-central-registry/main
9 changes: 2 additions & 7 deletions rust/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## MODULE.bazel
module(name = "pact_reference", version = "1.1.0")
module(name = "pact_reference", version = "1.1.1")
bazel_dep(name = "platforms", version = "0.0.5")
bazel_dep(name = "rules_cc", version = "0.0.2")
bazel_dep(name = "bazel_skylib", version = "1.2.0")
Expand All @@ -9,12 +9,7 @@ bazel_dep(
repo_name = "build_bazel_apple_support",
)

bazel_dep(name="rules_rust", version= "0.9.0")
git_override(
module_name = "rules_rust",
remote = "https://github.com/matts1/rules_rust.git",
commit = "f4804b407c05f4e63bbe17e84cdd8d5a87c653b2"
)
bazel_dep(name = "rules_rust", version = "0.20.1")

rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
rust.toolchain(edition = "2021")
Expand Down
45 changes: 10 additions & 35 deletions rust/cargo-bazel-lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "a9249e8f5069fc2af9656ae999b104dacb8a0c19f854d3987f7838e7cffc33df",
"checksum": "7df831b2e27ca9d6594dd3bf51afd5f11d40d73b29a2fc532f02bbc77f557bfa",
"crates": {
"addr2line 0.19.0": {
"name": "addr2line",
Expand Down Expand Up @@ -19148,17 +19148,14 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"wasm32-unknown-unknown",
"wasm32-wasi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-none"
"x86_64-unknown-freebsd"
],
"cfg(any(target_arch = \"x86\", target_arch = \"x86_64\", all(any(target_arch = \"aarch64\", target_arch = \"arm\"), any(target_os = \"android\", target_os = \"fuchsia\", target_os = \"linux\"))))": [
"aarch64-fuchsia",
Expand All @@ -19178,8 +19175,7 @@
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(any(target_os = \"android\", target_os = \"linux\"))": [
"aarch64-linux-android",
Expand Down Expand Up @@ -19277,16 +19273,13 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))": [
"aarch64-apple-darwin",
Expand All @@ -19308,16 +19301,13 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(any(windows, target_os = \"hermit\", target_os = \"unknown\")))": [
"aarch64-apple-darwin",
Expand All @@ -19337,16 +19327,13 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"wasm32-wasi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(target_arch = \"wasm32\"))": [
"aarch64-apple-darwin",
Expand All @@ -19368,16 +19355,13 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(target_family = \"wasm\"))": [
"aarch64-apple-darwin",
Expand All @@ -19399,16 +19383,13 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(windows))": [
"aarch64-apple-darwin",
Expand All @@ -19428,17 +19409,14 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"wasm32-unknown-unknown",
"wasm32-wasi",
"x86_64-apple-darwin",
"x86_64-apple-ios",
"x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(not(windows_raw_dylib))": [
"aarch64-apple-darwin",
Expand All @@ -19460,8 +19438,6 @@
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-none-elf",
"s390x-unknown-linux-gnu",
"thumbv7em-none-eabi",
"thumbv8m.main-none-eabi",
"wasm32-unknown-unknown",
"wasm32-wasi",
"x86_64-apple-darwin",
Expand All @@ -19470,8 +19446,7 @@
"x86_64-linux-android",
"x86_64-pc-windows-msvc",
"x86_64-unknown-freebsd",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-none"
"x86_64-unknown-linux-gnu"
],
"cfg(target_arch = \"wasm32\")": [
"wasm32-unknown-unknown",
Expand Down

0 comments on commit 63e13e3

Please sign in to comment.