diff --git a/bazel/rust_toolchain.bzl b/bazel/rust_toolchain.bzl index 794f89b..97c7314 100644 --- a/bazel/rust_toolchain.bzl +++ b/bazel/rust_toolchain.bzl @@ -1,7 +1,7 @@ -def _required_path(repository_ctx, command): - path = repository_ctx.which(command) +def _require(repository_ctx, executable): + path = repository_ctx.which(executable) if path == None: - fail("{} must be available in PATH. Enter the rust dev shell first.".format(command)) + fail("{} must be available in PATH.".format(executable)) return path @@ -13,13 +13,13 @@ def _execute(repository_ctx, arguments): def _rust_repository_impl(repository_ctx): - rustc = _required_path(repository_ctx, "rustc") - rustdoc = _required_path(repository_ctx, "rustdoc") - cargo = _required_path(repository_ctx, "cargo") - cargo_clippy = _required_path(repository_ctx, "cargo-clippy") - clippy_driver = _required_path(repository_ctx, "clippy-driver") - rustfmt = _required_path(repository_ctx, "rustfmt") - cc = _required_path(repository_ctx, "cc") + rustc = _require(repository_ctx, "rustc") + rustdoc = _require(repository_ctx, "rustdoc") + cargo = _require(repository_ctx, "cargo") + cargo_clippy = _require(repository_ctx, "cargo-clippy") + clippy_driver = _require(repository_ctx, "clippy-driver") + rustfmt = _require(repository_ctx, "rustfmt") + cc = _require(repository_ctx, "cc") sysroot = _execute(repository_ctx, [str(rustc), "--print", "sysroot"]) verbose_version = _execute(repository_ctx, [str(rustc), "-vV"])