Skip to content

Commit 08451d2

Browse files
committed
Remove WORKSPACE support
1 parent 02be80c commit 08451d2

73 files changed

Lines changed: 227 additions & 2651 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ build --incompatible_autoload_externally=
7171
## Bzlmod
7272
###############################################################################
7373

74-
# A configuration for disabling bzlmod.
75-
common:no-bzlmod --noenable_bzlmod --enable_workspace
76-
7774
# Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock
7875
common --lockfile_mode=off
7976

MODULE.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "platforms", version = "1.0.0")
1515
bazel_dep(name = "rules_cc", version = "0.2.4")
1616
bazel_dep(name = "rules_license", version = "1.0.0")
1717
bazel_dep(name = "rules_shell", version = "0.6.1")
18-
bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
18+
bazel_dep(name = "apple_support", version = "1.24.1")
1919

2020
internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
2121
use_repo(
@@ -83,7 +83,6 @@ use_repo(
8383
"rtvsc",
8484
"rtvsc__serde-1.0.228",
8585
"rtvsc__serde_json-1.0.149",
86-
"rules_rust_test_load_arbitrary_tool",
8786
"rules_rust_toolchain_test_target_json",
8887
)
8988

WORKSPACE.bazel

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1 @@
11
workspace(name = "rules_rust")
2-
3-
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
4-
5-
rules_rust_dependencies()
6-
7-
rust_register_toolchains()
8-
9-
load("@rules_rust//rust:repositories_transitive.bzl", "rules_rust_transitive_dependencies")
10-
11-
rules_rust_transitive_dependencies()
12-
13-
load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
14-
15-
crate_universe_dependencies(bootstrap = True)
16-
17-
load("//crate_universe/tools/cross_installer:cross_installer_deps.bzl", "cross_installer_deps")
18-
19-
cross_installer_deps()
20-
21-
load("@rules_rust//cargo:deps.bzl", "cargo_dependencies")
22-
23-
cargo_dependencies()
24-
25-
load("@rules_rust//tools/rust_analyzer:deps.bzl", "rust_analyzer_dependencies")
26-
27-
rust_analyzer_dependencies()
28-
29-
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
30-
31-
bazel_skylib_workspace()
32-
33-
load("//test:deps.bzl", "rules_rust_test_deps")
34-
35-
rules_rust_test_deps()
36-
37-
load("//test:deps_transitive.bzl", "rules_rust_test_deps_transitive")
38-
39-
rules_rust_test_deps_transitive()
40-
41-
# --- end stardoc
42-
43-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44-
45-
http_archive(
46-
name = "bazel_ci_rules",
47-
sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
48-
strip_prefix = "bazelci_rules-1.0.0",
49-
url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
50-
)
51-
52-
# To run with RBE on Bazel CI, uncomment the following lines.
53-
#
54-
# load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
55-
# rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu2204")

WORKSPACE.bzlmod

Lines changed: 0 additions & 1 deletion
This file was deleted.

cargo/deps.bzl

Lines changed: 0 additions & 19 deletions
This file was deleted.

cargo/extensions.bzl

Whitespace-only changes.

cargo/private/internal_extensions.bzl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
"""Bzlmod module extensions that are only used internally"""
22

33
load("@bazel_features//:features.bzl", "bazel_features")
4-
load("//cargo:deps.bzl", "cargo_dependencies")
4+
load("//cargo/3rdparty/crates:crates.bzl", "crate_repositories")
55

66
def _internal_deps_impl(module_ctx):
7-
# This should contain the subset of WORKSPACE.bazel that defines
8-
# repositories.
9-
107
direct_deps = []
11-
direct_deps.extend(cargo_dependencies())
8+
direct_deps.extend(crate_repositories())
129

1310
# is_dev_dep is ignored here. It's not relevant for internal_deps, as dev
1411
# dependencies are only relevant for module extensions that can be used
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"""# crates_repository"""
2+
3+
load(
4+
"//crate_universe/private:crates_repository.bzl",
5+
_crates_repository = "crates_repository",
6+
)
7+
8+
crates_repository = _crates_repository

crate_universe/crates_vendor.bzl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"""# crates_vendor"""
2+
3+
load(
4+
"//crate_universe/private:crates_vendor.bzl",
5+
_crates_vendor = "crates_vendor",
6+
)
7+
8+
crates_vendor = _crates_vendor

0 commit comments

Comments
 (0)