Skip to content

Commit 4e4a6c3

Browse files
dzbarskydzbarsky
committed
Stop generating proc_macro_deps in crate_universe
1 parent 1072ffb commit 4e4a6c3

File tree

7 files changed

+47
-71
lines changed

7 files changed

+47
-71
lines changed

‎crate_universe/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@ rust_library(
6666
aliases = aliases(),
6767
compile_data = [":rust_data"],
6868
edition = "2021",
69-
proc_macro_deps = all_crate_deps(proc_macro = True),
7069
# This target embeds additional, stamping related information (see
7170
# https://docs.bazel.build/versions/main/user-manual.html#workspace_status
7271
# for more information). Set stamp = -1 to indicate that it should respect
7372
# the value of the --stamp commandline flag.
7473
stamp = -1,
7574
version = VERSION,
7675
visibility = ["//visibility:public"],
77-
deps = all_crate_deps(normal = True),
76+
deps = all_crate_deps(normal = True, proc_macro = True),
7877
)
7978

8079
rust_binary(

‎crate_universe/defs.bzl‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ rust_library(
7575
aliases = aliases(),
7676
deps = all_crate_deps(
7777
normal = True,
78-
),
79-
proc_macro_deps = all_crate_deps(
8078
proc_macro = True,
8179
),
8280
)
@@ -90,8 +88,6 @@ rust_test(
9088
),
9189
deps = all_crate_deps(
9290
normal_dev = True,
93-
),
94-
proc_macro_deps = all_crate_deps(
9591
proc_macro_dev = True,
9692
),
9793
)
@@ -143,10 +139,8 @@ load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
143139
rust_library(
144140
name = "lib",
145141
deps = [
146-
"@crate_index//:tokio",
147-
],
148-
proc_macro_deps = [
149142
"@crate_index//:async-trait",
143+
"@crate_index//:tokio",
150144
],
151145
)
152146

‎crate_universe/extensions.bzl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ rust_library(
8989
aliases = aliases(),
9090
deps = all_crate_deps(
9191
normal = True,
92-
),
93-
proc_macro_deps = all_crate_deps(
9492
proc_macro = True,
9593
),
9694
)
@@ -104,8 +102,6 @@ rust_test(
104102
),
105103
deps = all_crate_deps(
106104
normal_dev = True,
107-
),
108-
proc_macro_deps = all_crate_deps(
109105
proc_macro_dev = True,
110106
),
111107
)

‎crate_universe/src/rendering.rs‎

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -582,11 +582,19 @@ impl Renderer {
582582
attrs.map(|attrs| attrs.data.clone()).unwrap_or_default(),
583583
),
584584
deps: SelectSet::new(
585-
self.make_deps(
586-
attrs.map(|attrs| attrs.deps.clone()).unwrap_or_default(),
587-
attrs
588-
.map(|attrs| attrs.extra_deps.clone())
589-
.unwrap_or_default(),
585+
Select::merge(
586+
self.make_deps(
587+
attrs.map(|attrs| attrs.deps.clone()).unwrap_or_default(),
588+
attrs
589+
.map(|attrs| attrs.extra_deps.clone())
590+
.unwrap_or_default(),
591+
),
592+
self.make_deps(
593+
attrs.map(|attrs| attrs.proc_macro_deps.clone()).unwrap_or_default(),
594+
attrs
595+
.map(|attrs| attrs.extra_proc_macro_deps.clone())
596+
.unwrap_or_default(),
597+
),
590598
),
591599
platforms,
592600
),
@@ -605,17 +613,6 @@ impl Renderer {
605613
linker_script: krate.common_attrs.linker_script.clone(),
606614
links: attrs.and_then(|attrs| attrs.links.clone()),
607615
pkg_name: Some(krate.name.clone()),
608-
proc_macro_deps: SelectSet::new(
609-
self.make_deps(
610-
attrs
611-
.map(|attrs| attrs.proc_macro_deps.clone())
612-
.unwrap_or_default(),
613-
attrs
614-
.map(|attrs| attrs.extra_proc_macro_deps.clone())
615-
.unwrap_or_default(),
616-
),
617-
platforms,
618-
),
619616
rundir: SelectScalar::new(
620617
attrs.map(|attrs| attrs.rundir.clone()).unwrap_or_default(),
621618
platforms,
@@ -674,16 +671,15 @@ impl Renderer {
674671
Ok(RustProcMacro {
675672
name: target.crate_name.clone(),
676673
deps: SelectSet::new(
677-
self.make_deps(
678-
krate.common_attrs.deps.clone(),
679-
krate.common_attrs.extra_deps.clone(),
680-
),
681-
platforms,
682-
),
683-
proc_macro_deps: SelectSet::new(
684-
self.make_deps(
685-
krate.common_attrs.proc_macro_deps.clone(),
686-
krate.common_attrs.extra_proc_macro_deps.clone(),
674+
Select::merge(
675+
self.make_deps(
676+
krate.common_attrs.deps.clone(),
677+
krate.common_attrs.extra_deps.clone(),
678+
),
679+
self.make_deps(
680+
krate.common_attrs.proc_macro_deps.clone(),
681+
krate.common_attrs.extra_proc_macro_deps.clone(),
682+
),
687683
),
688684
platforms,
689685
),
@@ -701,16 +697,15 @@ impl Renderer {
701697
Ok(RustLibrary {
702698
name: target.crate_name.clone(),
703699
deps: SelectSet::new(
704-
self.make_deps(
705-
krate.common_attrs.deps.clone(),
706-
krate.common_attrs.extra_deps.clone(),
707-
),
708-
platforms,
709-
),
710-
proc_macro_deps: SelectSet::new(
711-
self.make_deps(
712-
krate.common_attrs.proc_macro_deps.clone(),
713-
krate.common_attrs.extra_proc_macro_deps.clone(),
700+
Select::merge(
701+
self.make_deps(
702+
krate.common_attrs.deps.clone(),
703+
krate.common_attrs.extra_deps.clone(),
704+
),
705+
self.make_deps(
706+
krate.common_attrs.proc_macro_deps.clone(),
707+
krate.common_attrs.extra_proc_macro_deps.clone(),
708+
),
714709
),
715710
platforms,
716711
),
@@ -729,9 +724,15 @@ impl Renderer {
729724
Ok(RustBinary {
730725
name: format!("{}__bin", target.crate_name),
731726
deps: {
732-
let mut deps = self.make_deps(
733-
krate.common_attrs.deps.clone(),
734-
krate.common_attrs.extra_deps.clone(),
727+
let mut deps = Select::merge(
728+
self.make_deps(
729+
krate.common_attrs.deps.clone(),
730+
krate.common_attrs.extra_deps.clone(),
731+
),
732+
self.make_deps(
733+
krate.common_attrs.proc_macro_deps.clone(),
734+
krate.common_attrs.extra_proc_macro_deps.clone(),
735+
),
735736
);
736737
if let Some(library_target_name) = &krate.library_target_name {
737738
deps.insert(
@@ -741,13 +742,6 @@ impl Renderer {
741742
}
742743
SelectSet::new(deps, platforms)
743744
},
744-
proc_macro_deps: SelectSet::new(
745-
self.make_deps(
746-
krate.common_attrs.proc_macro_deps.clone(),
747-
krate.common_attrs.extra_proc_macro_deps.clone(),
748-
),
749-
platforms,
750-
),
751745
aliases: SelectDict::new(self.make_aliases(krate, false, false), platforms),
752746
common: self.make_common_attrs(platforms, krate, target)?,
753747
})

‎crate_universe/src/utils/starlark.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ pub(crate) struct CargoBuildScript {
118118
pub(crate) links: Option<String>,
119119
#[serde(skip_serializing_if = "Option::is_none")]
120120
pub(crate) pkg_name: Option<String>,
121-
#[serde(skip_serializing_if = "SelectSet::is_empty")]
122-
pub(crate) proc_macro_deps: SelectSet<Label>,
123121
#[serde(skip_serializing_if = "SelectScalar::is_empty")]
124122
pub(crate) rundir: SelectScalar<String>,
125123
#[serde(skip_serializing_if = "SelectDict::is_empty")]
@@ -153,8 +151,6 @@ pub(crate) struct RustProcMacro {
153151
pub(crate) name: String,
154152
#[serde(skip_serializing_if = "SelectSet::is_empty")]
155153
pub(crate) deps: SelectSet<Label>,
156-
#[serde(skip_serializing_if = "SelectSet::is_empty")]
157-
pub(crate) proc_macro_deps: SelectSet<Label>,
158154
#[serde(skip_serializing_if = "SelectDict::is_empty")]
159155
pub(crate) aliases: SelectDict<Label, String>,
160156
#[serde(flatten)]
@@ -166,8 +162,6 @@ pub(crate) struct RustLibrary {
166162
pub(crate) name: String,
167163
#[serde(skip_serializing_if = "SelectSet::is_empty")]
168164
pub(crate) deps: SelectSet<Label>,
169-
#[serde(skip_serializing_if = "SelectSet::is_empty")]
170-
pub(crate) proc_macro_deps: SelectSet<Label>,
171165
#[serde(skip_serializing_if = "SelectDict::is_empty")]
172166
pub(crate) aliases: SelectDict<Label, String>,
173167
#[serde(flatten)]
@@ -181,8 +175,6 @@ pub(crate) struct RustBinary {
181175
pub(crate) name: String,
182176
#[serde(skip_serializing_if = "SelectSet::is_empty")]
183177
pub(crate) deps: SelectSet<Label>,
184-
#[serde(skip_serializing_if = "SelectSet::is_empty")]
185-
pub(crate) proc_macro_deps: SelectSet<Label>,
186178
#[serde(skip_serializing_if = "SelectDict::is_empty")]
187179
pub(crate) aliases: SelectDict<Label, String>,
188180
#[serde(flatten)]

‎crate_universe/tools/cross_installer/BUILD.bazel‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ rust_binary(
2121
"@rules_rust//rust/toolchain:current_cargo_files",
2222
],
2323
edition = "2021",
24-
proc_macro_deps = all_crate_deps(proc_macro = True),
2524
rustc_env = {
2625
"CARGO": "$(rlocationpath @rules_rust//rust/toolchain:current_cargo_files)",
2726
"CROSS_BIN": "$(rlocationpath :cross)",
2827
"CROSS_CONFIG_RLOCATION": "$(rlocationpath :Cross.toml)",
2928
},
30-
deps = all_crate_deps(normal = True) + ["@rules_rust//rust/runfiles"],
29+
deps = all_crate_deps(
30+
normal = True,
31+
proc_macro = True,
32+
) + ["@rules_rust//rust/runfiles"],
3133
)
3234

3335
filegroup(

‎crate_universe/tools/urls_generator/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ rust_binary(
1414
"//crate_universe/private:urls.bzl",
1515
],
1616
edition = "2021",
17-
proc_macro_deps = all_crate_deps(proc_macro = True),
1817
rustc_env = {
1918
"MODULE_ROOT_PATH": "$(rootpath //crate_universe/private:urls.bzl)",
2019
},
21-
deps = all_crate_deps(normal = True),
20+
deps = all_crate_deps(normal = True, proc_macro = True),
2221
)

0 commit comments

Comments
 (0)