diff --git a/cargo/defs.bzl b/cargo/defs.bzl index 609965112c..0a93379cc4 100644 --- a/cargo/defs.bzl +++ b/cargo/defs.bzl @@ -3,30 +3,20 @@ Common definitions for the `@rules_rust//cargo` package """ -load( - "//cargo/private:cargo_bootstrap.bzl", - _cargo_bootstrap_repository = "cargo_bootstrap_repository", - _cargo_env = "cargo_env", -) load( "//cargo/private:cargo_build_script_wrapper.bzl", _cargo_build_script = "cargo_build_script", ) -load( - "//cargo/private:cargo_dep_env.bzl", - _cargo_dep_env = "cargo_dep_env", -) load( "//cargo/private:cargo_lints.bzl", _extract_cargo_lints = "extract_cargo_lints", ) -load("//cargo/private:cargo_toml_env_vars.bzl", _cargo_toml_env_vars = "cargo_toml_env_vars") - -cargo_bootstrap_repository = _cargo_bootstrap_repository -cargo_env = _cargo_env +load( + "//cargo/private:cargo_toml_env_vars.bzl", + _cargo_toml_env_vars = "cargo_toml_env_vars", +) cargo_build_script = _cargo_build_script -cargo_dep_env = _cargo_dep_env extract_cargo_lints = _extract_cargo_lints diff --git a/cargo/tests/dep_env/BUILD.bazel b/cargo/tests/dep_env/BUILD.bazel index f4f716db00..c5b52651eb 100644 --- a/cargo/tests/dep_env/BUILD.bazel +++ b/cargo/tests/dep_env/BUILD.bazel @@ -1,7 +1,8 @@ """Tests for passing configuration to cargo_build_script rules""" load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("//cargo:defs.bzl", "cargo_build_script", "cargo_dep_env") +load("//cargo:defs.bzl", "cargo_build_script") +load("//cargo/private:cargo_dep_env.bzl", "cargo_dep_env") load("//rust:defs.bzl", "rust_library", "rust_library_group", "rust_test") load(":dep_env.bzl", "create_dep_dir") diff --git a/crate_universe/private/internal_extensions.bzl b/crate_universe/private/internal_extensions.bzl index bc9326de22..62c1ad65fd 100644 --- a/crate_universe/private/internal_extensions.bzl +++ b/crate_universe/private/internal_extensions.bzl @@ -2,8 +2,10 @@ load("@bazel_features//:features.bzl", "bazel_features") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") -load("//cargo:defs.bzl", "cargo_bootstrap_repository") load("//cargo/3rdparty/crates:crates.bzl", _cargo_crate_repositories = "crate_repositories") + +# buildifier: disable=bzl-visibility +load("//cargo/private:cargo_bootstrap.bzl", "cargo_bootstrap_repository") load("//crate_universe/3rdparty:third_party_deps.bzl", "third_party_deps") load("//crate_universe/3rdparty/crates:crates.bzl", _vendor_crate_repositories = "crate_repositories") load("//crate_universe/private:srcs.bzl", "CARGO_BAZEL_SRCS") diff --git a/crate_universe/tools/cross_installer/cross_installer_deps.bzl b/crate_universe/tools/cross_installer/cross_installer_deps.bzl index 8553791cee..8ee08ffb90 100644 --- a/crate_universe/tools/cross_installer/cross_installer_deps.bzl +++ b/crate_universe/tools/cross_installer/cross_installer_deps.bzl @@ -2,7 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") -load("//cargo:defs.bzl", "cargo_bootstrap_repository") + +# buildifier: disable=bzl-visibility +load("//cargo/private:cargo_bootstrap.bzl", "cargo_bootstrap_repository") # buildifier: disable=bzl-visibility load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION") diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index 27c2ccc6f1..4d74eba741 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -37,10 +37,7 @@ stardoc( out = "src/cargo.md", input = "@rules_rust//cargo:defs.bzl", symbol_names = [ - "cargo_bootstrap_repository", "cargo_build_script", - "cargo_dep_env", - "cargo_env", "extract_cargo_lints", ], table_of_contents_template = "@stardoc//stardoc:templates/markdown_tables/table_of_contents.vm",