Updated crate_universe bzlmod to support skipping splicing (#3148)
Additional Changes:
- Updated crate_universe macros to refer to aliases instead of direct
external target for bzlmod support.
- Added `rust_host_tools_nightly` module for exposing a nightly
toolchain
- Converted `examples/crate_universe` to use bzlmod
diff --git a/extensions/wasm_bindgen/3rdparty/crates/BUILD.bazel b/extensions/wasm_bindgen/3rdparty/crates/BUILD.bazel
index a76bcdf..0662888 100644
--- a/extensions/wasm_bindgen/3rdparty/crates/BUILD.bazel
+++ b/extensions/wasm_bindgen/3rdparty/crates/BUILD.bazel
@@ -32,120 +32,240 @@
# Workspace Member Dependencies
alias(
+ name = "anyhow-1.0.71",
+ actual = "@rrwbd__anyhow-1.0.71//:anyhow",
+ tags = ["manual"],
+)
+
+alias(
name = "anyhow",
actual = "@rrwbd__anyhow-1.0.71//:anyhow",
tags = ["manual"],
)
alias(
+ name = "assert_cmd-1.0.8",
+ actual = "@rrwbd__assert_cmd-1.0.8//:assert_cmd",
+ tags = ["manual"],
+)
+
+alias(
name = "assert_cmd",
actual = "@rrwbd__assert_cmd-1.0.8//:assert_cmd",
tags = ["manual"],
)
alias(
+ name = "diff-0.1.13",
+ actual = "@rrwbd__diff-0.1.13//:diff",
+ tags = ["manual"],
+)
+
+alias(
name = "diff",
actual = "@rrwbd__diff-0.1.13//:diff",
tags = ["manual"],
)
alias(
+ name = "docopt-1.1.1",
+ actual = "@rrwbd__docopt-1.1.1//:docopt",
+ tags = ["manual"],
+)
+
+alias(
name = "docopt",
actual = "@rrwbd__docopt-1.1.1//:docopt",
tags = ["manual"],
)
alias(
+ name = "env_logger-0.8.4",
+ actual = "@rrwbd__env_logger-0.8.4//:env_logger",
+ tags = ["manual"],
+)
+
+alias(
name = "env_logger",
actual = "@rrwbd__env_logger-0.8.4//:env_logger",
tags = ["manual"],
)
alias(
+ name = "log-0.4.19",
+ actual = "@rrwbd__log-0.4.19//:log",
+ tags = ["manual"],
+)
+
+alias(
name = "log",
actual = "@rrwbd__log-0.4.19//:log",
tags = ["manual"],
)
alias(
+ name = "predicates-1.0.8",
+ actual = "@rrwbd__predicates-1.0.8//:predicates",
+ tags = ["manual"],
+)
+
+alias(
name = "predicates",
actual = "@rrwbd__predicates-1.0.8//:predicates",
tags = ["manual"],
)
alias(
+ name = "rayon-1.7.0",
+ actual = "@rrwbd__rayon-1.7.0//:rayon",
+ tags = ["manual"],
+)
+
+alias(
name = "rayon",
actual = "@rrwbd__rayon-1.7.0//:rayon",
tags = ["manual"],
)
alias(
+ name = "rouille-3.6.2",
+ actual = "@rrwbd__rouille-3.6.2//:rouille",
+ tags = ["manual"],
+)
+
+alias(
name = "rouille",
actual = "@rrwbd__rouille-3.6.2//:rouille",
tags = ["manual"],
)
alias(
+ name = "serde-1.0.171",
+ actual = "@rrwbd__serde-1.0.171//:serde",
+ tags = ["manual"],
+)
+
+alias(
name = "serde",
actual = "@rrwbd__serde-1.0.171//:serde",
tags = ["manual"],
)
alias(
+ name = "serde_derive-1.0.171",
+ actual = "@rrwbd__serde_derive-1.0.171//:serde_derive",
+ tags = ["manual"],
+)
+
+alias(
name = "serde_derive",
actual = "@rrwbd__serde_derive-1.0.171//:serde_derive",
tags = ["manual"],
)
alias(
+ name = "serde_json-1.0.102",
+ actual = "@rrwbd__serde_json-1.0.102//:serde_json",
+ tags = ["manual"],
+)
+
+alias(
name = "serde_json",
actual = "@rrwbd__serde_json-1.0.102//:serde_json",
tags = ["manual"],
)
alias(
+ name = "tempfile-3.6.0",
+ actual = "@rrwbd__tempfile-3.6.0//:tempfile",
+ tags = ["manual"],
+)
+
+alias(
name = "tempfile",
actual = "@rrwbd__tempfile-3.6.0//:tempfile",
tags = ["manual"],
)
alias(
+ name = "ureq-2.8.0",
+ actual = "@rrwbd__ureq-2.8.0//:ureq",
+ tags = ["manual"],
+)
+
+alias(
name = "ureq",
actual = "@rrwbd__ureq-2.8.0//:ureq",
tags = ["manual"],
)
alias(
+ name = "walrus-0.20.3",
+ actual = "@rrwbd__walrus-0.20.3//:walrus",
+ tags = ["manual"],
+)
+
+alias(
name = "walrus",
actual = "@rrwbd__walrus-0.20.3//:walrus",
tags = ["manual"],
)
alias(
+ name = "wasm-bindgen-0.2.92",
+ actual = "@rrwbd__wasm-bindgen-0.2.92//:wasm_bindgen",
+ tags = ["manual"],
+)
+
+alias(
name = "wasm-bindgen",
actual = "@rrwbd__wasm-bindgen-0.2.92//:wasm_bindgen",
tags = ["manual"],
)
alias(
+ name = "wasm-bindgen-cli-support-0.2.92",
+ actual = "@rrwbd__wasm-bindgen-cli-support-0.2.92//:wasm_bindgen_cli_support",
+ tags = ["manual"],
+)
+
+alias(
name = "wasm-bindgen-cli-support",
actual = "@rrwbd__wasm-bindgen-cli-support-0.2.92//:wasm_bindgen_cli_support",
tags = ["manual"],
)
alias(
+ name = "wasm-bindgen-shared-0.2.92",
+ actual = "@rrwbd__wasm-bindgen-shared-0.2.92//:wasm_bindgen_shared",
+ tags = ["manual"],
+)
+
+alias(
name = "wasm-bindgen-shared",
actual = "@rrwbd__wasm-bindgen-shared-0.2.92//:wasm_bindgen_shared",
tags = ["manual"],
)
alias(
+ name = "wasmparser-0.102.0",
+ actual = "@rrwbd__wasmparser-0.102.0//:wasmparser",
+ tags = ["manual"],
+)
+
+alias(
name = "wasmparser",
actual = "@rrwbd__wasmparser-0.102.0//:wasmparser",
tags = ["manual"],
)
alias(
+ name = "wasmprinter-0.2.60",
+ actual = "@rrwbd__wasmprinter-0.2.60//:wasmprinter",
+ tags = ["manual"],
+)
+
+alias(
name = "wasmprinter",
actual = "@rrwbd__wasmprinter-0.2.60//:wasmprinter",
tags = ["manual"],
diff --git a/extensions/wasm_bindgen/3rdparty/crates/defs.bzl b/extensions/wasm_bindgen/3rdparty/crates/defs.bzl
index 38c0d73..fc539cf 100644
--- a/extensions/wasm_bindgen/3rdparty/crates/defs.bzl
+++ b/extensions/wasm_bindgen/3rdparty/crates/defs.bzl
@@ -295,18 +295,18 @@
_NORMAL_DEPENDENCIES = {
"": {
_COMMON_CONDITION: {
- "anyhow": Label("@rrwbd__anyhow-1.0.71//:anyhow"),
- "docopt": Label("@rrwbd__docopt-1.1.1//:docopt"),
- "env_logger": Label("@rrwbd__env_logger-0.8.4//:env_logger"),
- "log": Label("@rrwbd__log-0.4.19//:log"),
- "rouille": Label("@rrwbd__rouille-3.6.2//:rouille"),
- "serde": Label("@rrwbd__serde-1.0.171//:serde"),
- "serde_json": Label("@rrwbd__serde_json-1.0.102//:serde_json"),
- "ureq": Label("@rrwbd__ureq-2.8.0//:ureq"),
- "walrus": Label("@rrwbd__walrus-0.20.3//:walrus"),
- "wasm-bindgen": Label("@rrwbd__wasm-bindgen-0.2.92//:wasm_bindgen"),
- "wasm-bindgen-cli-support": Label("@rrwbd__wasm-bindgen-cli-support-0.2.92//:wasm_bindgen_cli_support"),
- "wasm-bindgen-shared": Label("@rrwbd__wasm-bindgen-shared-0.2.92//:wasm_bindgen_shared"),
+ "anyhow": Label("@rrwbd//:anyhow-1.0.71"),
+ "docopt": Label("@rrwbd//:docopt-1.1.1"),
+ "env_logger": Label("@rrwbd//:env_logger-0.8.4"),
+ "log": Label("@rrwbd//:log-0.4.19"),
+ "rouille": Label("@rrwbd//:rouille-3.6.2"),
+ "serde": Label("@rrwbd//:serde-1.0.171"),
+ "serde_json": Label("@rrwbd//:serde_json-1.0.102"),
+ "ureq": Label("@rrwbd//:ureq-2.8.0"),
+ "walrus": Label("@rrwbd//:walrus-0.20.3"),
+ "wasm-bindgen": Label("@rrwbd//:wasm-bindgen-0.2.92"),
+ "wasm-bindgen-cli-support": Label("@rrwbd//:wasm-bindgen-cli-support-0.2.92"),
+ "wasm-bindgen-shared": Label("@rrwbd//:wasm-bindgen-shared-0.2.92"),
},
},
}
@@ -321,13 +321,13 @@
_NORMAL_DEV_DEPENDENCIES = {
"": {
_COMMON_CONDITION: {
- "assert_cmd": Label("@rrwbd__assert_cmd-1.0.8//:assert_cmd"),
- "diff": Label("@rrwbd__diff-0.1.13//:diff"),
- "predicates": Label("@rrwbd__predicates-1.0.8//:predicates"),
- "rayon": Label("@rrwbd__rayon-1.7.0//:rayon"),
- "tempfile": Label("@rrwbd__tempfile-3.6.0//:tempfile"),
- "wasmparser": Label("@rrwbd__wasmparser-0.102.0//:wasmparser"),
- "wasmprinter": Label("@rrwbd__wasmprinter-0.2.60//:wasmprinter"),
+ "assert_cmd": Label("@rrwbd//:assert_cmd-1.0.8"),
+ "diff": Label("@rrwbd//:diff-0.1.13"),
+ "predicates": Label("@rrwbd//:predicates-1.0.8"),
+ "rayon": Label("@rrwbd//:rayon-1.7.0"),
+ "tempfile": Label("@rrwbd//:tempfile-3.6.0"),
+ "wasmparser": Label("@rrwbd//:wasmparser-0.102.0"),
+ "wasmprinter": Label("@rrwbd//:wasmprinter-0.2.60"),
},
},
}
@@ -342,7 +342,7 @@
_PROC_MACRO_DEPENDENCIES = {
"": {
_COMMON_CONDITION: {
- "serde_derive": Label("@rrwbd__serde_derive-1.0.171//:serde_derive"),
+ "serde_derive": Label("@rrwbd//:serde_derive-1.0.171"),
},
},
}
diff --git a/extensions/wasm_bindgen/MODULE.bazel b/extensions/wasm_bindgen/MODULE.bazel
index eba0d18..4d44237 100644
--- a/extensions/wasm_bindgen/MODULE.bazel
+++ b/extensions/wasm_bindgen/MODULE.bazel
@@ -29,6 +29,7 @@
rust_ext = use_extension("//:extensions.bzl", "rust_ext")
use_repo(
rust_ext,
+ "rrwbd",
"rrwbd__anyhow-1.0.71",
"rrwbd__assert_cmd-1.0.8",
"rrwbd__diff-0.1.13",
diff --git a/extensions/wasm_bindgen/repositories.bzl b/extensions/wasm_bindgen/repositories.bzl
index 9a1ddfa..725f005 100644
--- a/extensions/wasm_bindgen/repositories.bzl
+++ b/extensions/wasm_bindgen/repositories.bzl
@@ -16,7 +16,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//3rdparty/crates:defs.bzl", "crate_repositories")
+load("//3rdparty/crates:crates.bzl", "crate_repositories")
WASM_BINDGEN_VERSION = "0.2.92"
