Skip to content

Commit f4f0188

Browse files
UebelAndreUebelAndre
authored
Consolidated //cargo 3rdparty dependencies (#3672)
Minor improvement to de-duplicate targets.
1 parent 3f39209 commit f4f0188

File tree

116 files changed

+8205
-3100
lines changed

Some content is hidden

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

116 files changed

+8205
-3100
lines changed

‎MODULE.bazel‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ use_repo(
3535
cargo_internal_deps = use_extension("//cargo/private:internal_extensions.bzl", "i")
3636
use_repo(
3737
cargo_internal_deps,
38-
"rrcti",
39-
"rrcti__cargo_toml-0.20.5",
40-
"rules_rust_ctve",
41-
"rules_rust_ctve__cargo-util-schemas-0.3.1",
42-
"rules_rust_ctve__pathdiff-0.1.0",
43-
"rules_rust_ctve__semver-1.0.25",
44-
"rules_rust_ctve__toml-0.8.20",
38+
"rrc",
39+
"rrc__cargo-util-schemas-0.3.1",
40+
"rrc__cargo_toml-0.20.5",
41+
"rrc__pathdiff-0.1.0",
42+
"rrc__semver-1.0.25",
43+
"rrc__toml-0.8.20",
4544
)
4645

4746
rust = use_extension("//rust:extensions.bzl", "rust")

‎cargo/3rdparty/BUILD.bazel‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
load("//crate_universe:defs.bzl", "crates_vendor", "render_config")
2+
3+
crates_vendor(
4+
name = "crates_vendor",
5+
cargo_lockfile = "Cargo.Bazel.lock",
6+
manifests = [
7+
"//cargo:Cargo.toml",
8+
],
9+
mode = "remote",
10+
render_config = render_config(generate_cargo_toml_env_vars = False),
11+
# `rrc` == `rules_rust_cargo`.
12+
repository_name = "rrc",
13+
tags = ["manual"],
14+
)

‎cargo/cargo_toml_variable_extractor/3rdparty/Cargo.Bazel.lock‎ renamed to ‎cargo/3rdparty/Cargo.Bazel.lock‎

Lines changed: 19 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.autocfg-1.5.0.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.autocfg-1.5.0.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.bazel‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
package(default_visibility = ["//visibility:public"])
@@ -33,48 +33,60 @@ filegroup(
3333
# Workspace Member Dependencies
3434
alias(
3535
name = "cargo-util-schemas-0.3.1",
36-
actual = "@rules_rust_ctve__cargo-util-schemas-0.3.1//:cargo_util_schemas",
36+
actual = "@rrc__cargo-util-schemas-0.3.1//:cargo_util_schemas",
3737
tags = ["manual"],
3838
)
3939

4040
alias(
4141
name = "cargo-util-schemas",
42-
actual = "@rules_rust_ctve__cargo-util-schemas-0.3.1//:cargo_util_schemas",
42+
actual = "@rrc__cargo-util-schemas-0.3.1//:cargo_util_schemas",
43+
tags = ["manual"],
44+
)
45+
46+
alias(
47+
name = "cargo_toml-0.20.5",
48+
actual = "@rrc__cargo_toml-0.20.5//:cargo_toml",
49+
tags = ["manual"],
50+
)
51+
52+
alias(
53+
name = "cargo_toml",
54+
actual = "@rrc__cargo_toml-0.20.5//:cargo_toml",
4355
tags = ["manual"],
4456
)
4557

4658
alias(
4759
name = "pathdiff-0.1.0",
48-
actual = "@rules_rust_ctve__pathdiff-0.1.0//:pathdiff",
60+
actual = "@rrc__pathdiff-0.1.0//:pathdiff",
4961
tags = ["manual"],
5062
)
5163

5264
alias(
5365
name = "pathdiff",
54-
actual = "@rules_rust_ctve__pathdiff-0.1.0//:pathdiff",
66+
actual = "@rrc__pathdiff-0.1.0//:pathdiff",
5567
tags = ["manual"],
5668
)
5769

5870
alias(
5971
name = "semver-1.0.25",
60-
actual = "@rules_rust_ctve__semver-1.0.25//:semver",
72+
actual = "@rrc__semver-1.0.25//:semver",
6173
tags = ["manual"],
6274
)
6375

6476
alias(
6577
name = "semver",
66-
actual = "@rules_rust_ctve__semver-1.0.25//:semver",
78+
actual = "@rrc__semver-1.0.25//:semver",
6779
tags = ["manual"],
6880
)
6981

7082
alias(
7183
name = "toml-0.8.20",
72-
actual = "@rules_rust_ctve__toml-0.8.20//:toml",
84+
actual = "@rrc__toml-0.8.20//:toml",
7385
tags = ["manual"],
7486
)
7587

7688
alias(
7789
name = "toml",
78-
actual = "@rules_rust_ctve__toml-0.8.20//:toml",
90+
actual = "@rrc__toml-0.8.20//:toml",
7991
tags = ["manual"],
8092
)

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.cargo-util-schemas-0.3.1.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.cargo-util-schemas-0.3.1.bazel‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -85,13 +85,13 @@ rust_library(
8585
}),
8686
version = "0.3.1",
8787
deps = [
88-
"@rules_rust_ctve__semver-1.0.25//:semver",
89-
"@rules_rust_ctve__serde-1.0.217//:serde",
90-
"@rules_rust_ctve__serde-untagged-0.1.6//:serde_untagged",
91-
"@rules_rust_ctve__serde-value-0.7.0//:serde_value",
92-
"@rules_rust_ctve__thiserror-1.0.69//:thiserror",
93-
"@rules_rust_ctve__toml-0.8.20//:toml",
94-
"@rules_rust_ctve__unicode-xid-0.2.6//:unicode_xid",
95-
"@rules_rust_ctve__url-2.5.4//:url",
88+
"@rrc__semver-1.0.25//:semver",
89+
"@rrc__serde-1.0.217//:serde",
90+
"@rrc__serde-untagged-0.1.6//:serde_untagged",
91+
"@rrc__serde-value-0.7.0//:serde_value",
92+
"@rrc__thiserror-1.0.69//:thiserror",
93+
"@rrc__toml-0.8.20//:toml",
94+
"@rrc__unicode-xid-0.2.6//:unicode_xid",
95+
"@rrc__url-2.5.4//:url",
9696
],
9797
)

‎cargo/private/cargo_toml_info/3rdparty/crates/BUILD.cargo_toml-0.20.5.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.cargo_toml-0.20.5.bazel‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/private/cargo_toml_info/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

9-
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
109
load("@rules_rust//rust:defs.bzl", "rust_library")
1110

1211
package(default_visibility = ["//visibility:public"])
1312

14-
cargo_toml_env_vars(
15-
name = "cargo_toml_env_vars",
16-
src = "Cargo.toml",
17-
)
18-
1913
rust_library(
2014
name = "cargo_toml",
2115
srcs = glob(
@@ -36,9 +30,6 @@ rust_library(
3630
),
3731
crate_root = "src/cargo_toml.rs",
3832
edition = "2021",
39-
rustc_env_files = [
40-
":cargo_toml_env_vars",
41-
],
4233
rustc_flags = [
4334
"--cap-lints=allow",
4435
],
@@ -70,6 +61,7 @@ rust_library(
7061
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7162
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7263
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
64+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7365
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7466
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7567
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
@@ -93,7 +85,7 @@ rust_library(
9385
}),
9486
version = "0.20.5",
9587
deps = [
96-
"@rrcti__serde-1.0.214//:serde",
97-
"@rrcti__toml-0.8.19//:toml",
88+
"@rrc__serde-1.0.217//:serde",
89+
"@rrc__toml-0.8.20//:toml",
9890
],
9991
)

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.displaydoc-0.2.5.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.displaydoc-0.2.5.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
@@ -85,8 +85,8 @@ rust_proc_macro(
8585
}),
8686
version = "0.2.5",
8787
deps = [
88-
"@rules_rust_ctve__proc-macro2-1.0.93//:proc_macro2",
89-
"@rules_rust_ctve__quote-1.0.38//:quote",
90-
"@rules_rust_ctve__syn-2.0.98//:syn",
88+
"@rrc__proc-macro2-1.0.93//:proc_macro2",
89+
"@rrc__quote-1.0.38//:quote",
90+
"@rrc__syn-2.0.98//:syn",
9191
],
9292
)

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.equivalent-1.0.1.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.equivalent-1.0.1.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

‎cargo/cargo_toml_variable_extractor/3rdparty/crates/BUILD.erased-serde-0.4.5.bazel‎ renamed to ‎cargo/3rdparty/crates/BUILD.erased-serde-0.4.5.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run @@//cargo/cargo_toml_variable_extractor/3rdparty:crates_vendor
6+
# bazel run @@//cargo/3rdparty:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -88,7 +88,7 @@ rust_library(
8888
}),
8989
version = "0.4.5",
9090
deps = [
91-
"@rules_rust_ctve__serde-1.0.217//:serde",
92-
"@rules_rust_ctve__typeid-1.0.2//:typeid",
91+
"@rrc__serde-1.0.217//:serde",
92+
"@rrc__typeid-1.0.2//:typeid",
9393
],
9494
)

0 commit comments

Comments
 (0)