Skip to content

Commit 538af56

Browse files
committed
Manual migrations
1 parent b0f04a8 commit 538af56

File tree

52 files changed

+178
-178
lines changed

Some content is hidden

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

52 files changed

+178
-178
lines changed

cargo/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The dependencies for running the cargo_toml_info binary.
33
"""
44

55
load(
6-
"//cargo/3rdparty/crates:crates.bzl",
6+
"//cargo/3rdparty/crates:defs.bzl",
77
"crate_repositories",
88
)
99

cargo/private/cargo_toml_info/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rust_binary(
77
srcs = ["main.rs"],
88
edition = "2021",
99
visibility = ["//visibility:public"],
10-
deps = ["//cargo/3rdparty/crates:cargo_toml"],
10+
deps = ["//cargo/3rdparty/crates/cargo_toml"],
1111
)
1212

1313
rust_test(

cargo/private/cargo_toml_variable_extractor/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ rust_binary(
66
edition = "2021",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//cargo/3rdparty/crates:cargo-util-schemas",
10-
"//cargo/3rdparty/crates:pathdiff",
11-
"//cargo/3rdparty/crates:semver",
12-
"//cargo/3rdparty/crates:toml",
9+
"//cargo/3rdparty/crates/cargo-util-schemas",
10+
"//cargo/3rdparty/crates/pathdiff",
11+
"//cargo/3rdparty/crates/semver",
12+
"//cargo/3rdparty/crates/toml",
1313
],
1414
)

crate_universe/extensions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ load("@rules_rust//rust:defs.bzl", "rust_binary")
336336
rust_binary(
337337
name = "hello_sys",
338338
srcs = ["src/main.rs"],
339-
deps = ["//basic/3rdparty/crates:bzip2"],
339+
deps = ["//basic/3rdparty/bzip2"],
340340
visibility = ["//visibility:public"],
341341
)
342342
```

crate_universe/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"""A module defining dependencies of the `cargo-bazel` Rust target"""
22

33
load("@rules_rust//rust:defs.bzl", "rust_common")
4-
load("//cargo/3rdparty/crates:crates.bzl", cargo_crate_repositories = "crate_repositories")
4+
load("//cargo/3rdparty/crates:defs.bzl", cargo_crate_repositories = "crate_repositories")
55
load("//crate_universe:deps_bootstrap.bzl", "cargo_bazel_bootstrap")
66
load("//crate_universe/3rdparty:third_party_deps.bzl", "third_party_deps")
7-
load("//crate_universe/3rdparty/crates:crates.bzl", _vendor_crate_repositories = "crate_repositories")
7+
load("//crate_universe/3rdparty/crates:defs.bzl", _vendor_crate_repositories = "crate_repositories")
88
load("//crate_universe/private:vendor_utils.bzl", "crates_vendor_deps")
99

1010
def crate_universe_dependencies(rust_version = rust_common.default_version, bootstrap = False, **kwargs):

examples/all_deps_vendor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ rust_binary(
122122
srcs = ["src/main.rs"],
123123
# Note the `crate_universe` dependencies here need to have been loaded
124124
# in the WORKSPACE file. See `//:sys_deps.bzl` for more details.
125-
deps = ["//basic/3rdparty/crates:bzip2"],
125+
deps = ["//basic/3rdparty/crates/bzip2"],
126126
visibility = ["//visibility:public"],
127127
)
128128
```

examples/all_deps_vendor/basic/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ rust_binary(
66
visibility = ["//visibility:public"],
77
# Note the `crate_universe` dependencies here need to have been loaded
88
# in the WORKSPACE file. See `//:sys_deps.bzl` for more details.
9-
deps = ["//basic/3rdparty/crates:bzip2"],
9+
deps = ["//basic/3rdparty/crates/bzip2"],
1010
)

examples/all_deps_vendor/extensions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Bzlmod module extensions"""
22

3-
load("//basic/3rdparty/crates:crates.bzl", basic_crate_repositories = "crate_repositories")
3+
load("//basic/3rdparty/crates:defs.bzl", basic_crate_repositories = "crate_repositories")
44

55
def _rust_example_impl(module_ctx):
66
# This should contain the subset of WORKSPACE.bazel that defines

examples/crate_universe/vendor_extensions.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
44
load(
5-
"//vendor_external/crates:crates.bzl",
5+
"//vendor_external/crates:defs.bzl",
66
crates_vendor_external_repositories = "crate_repositories",
77
)
88
load(
9-
"//vendor_remote_manifests/crates:crates.bzl",
9+
"//vendor_remote_manifests/crates:defs.bzl",
1010
crates_vendor_manifests_repositories = "crate_repositories",
1111
)
1212
load(
13-
"//vendor_remote_pkgs/crates:crates.bzl",
13+
"//vendor_remote_pkgs/crates:defs.bzl",
1414
crates_vendor_packages_repositories = "crate_repositories",
1515
)
1616

examples/crate_universe/vendor_local_pkgs/BUILD.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ rust_binary(
5555
srcs = glob(["**/*.rs"]),
5656
edition = "2018",
5757
deps = [
58-
"//vendor_local_pkgs/crates:axum",
59-
"//vendor_local_pkgs/crates:hyper",
60-
"//vendor_local_pkgs/crates:mime",
61-
"//vendor_local_pkgs/crates:serde_json",
62-
"//vendor_local_pkgs/crates:tokio",
63-
"//vendor_local_pkgs/crates:tower",
64-
"//vendor_local_pkgs/crates:tower-http",
65-
"//vendor_local_pkgs/crates:tracing",
66-
"//vendor_local_pkgs/crates:tracing-subscriber",
58+
"//vendor_local_pkgs/crates/axum",
59+
"//vendor_local_pkgs/crates/hyper",
60+
"//vendor_local_pkgs/crates/mime",
61+
"//vendor_local_pkgs/crates/serde_json",
62+
"//vendor_local_pkgs/crates/tokio",
63+
"//vendor_local_pkgs/crates/tower",
64+
"//vendor_local_pkgs/crates/tower-http",
65+
"//vendor_local_pkgs/crates/tracing",
66+
"//vendor_local_pkgs/crates/tracing-subscriber",
6767
],
6868
)
6969

0 commit comments

Comments
 (0)