Skip to content

[DRAFT] update CrateInfo.aliases to be a dict[Label, str] #3641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DRAFT] update CrateInfo.aliases to be a dict[Label, str] #3641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/private/providers.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
CrateInfo = provider(
doc = "A provider containing general Crate information.",
fields = {
"aliases": "Dict[Target, String]: Renamed and aliased crates",
"aliases": "Dict[Label, String]: Renamed and aliased crates",
"cfgs": (
"List[str]: The set of enabled cfgs for this crate. Note that this field is populated only " +
"when @rules_rust//rust/settings:collect_cfgs is set."
Expand Down
8 changes: 4 additions & 4 deletions rust/private/rust.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def _rust_library_common(ctx, crate_type):
srcs = depset(srcs),
deps = depset(deps),
proc_macro_deps = depset(proc_macro_deps),
aliases = ctx.attr.aliases,
aliases = {k.label: v for (k, v) in ctx.attr.aliases.items()},
output = rust_lib,
rustc_output = generate_output_diagnostics(ctx, rust_lib),
metadata = rust_metadata,
Expand Down Expand Up @@ -287,7 +287,7 @@ def _rust_binary_impl(ctx):
srcs = depset(srcs),
deps = depset(deps),
proc_macro_deps = depset(proc_macro_deps),
aliases = ctx.attr.aliases,
aliases = {k.label: v for k, v in ctx.attr.aliases.items()},
output = output,
rustc_output = generate_output_diagnostics(ctx, output),
metadata = rust_metadata,
Expand Down Expand Up @@ -409,7 +409,7 @@ def _rust_test_impl(ctx):
{},
))
aliases = dict(crate.aliases)
aliases.update(ctx.attr.aliases)
aliases.update({k.label: v for k, v in ctx.attr.aliases.items()})

# Build the test binary using the dependency's srcs.
crate_info_dict = dict(
Expand Down Expand Up @@ -483,7 +483,7 @@ def _rust_test_impl(ctx):
srcs = depset(srcs),
deps = depset(deps),
proc_macro_deps = depset(proc_macro_deps),
aliases = ctx.attr.aliases,
aliases = {k.label: v for k, v in ctx.attr.aliases.items()},
output = output,
rustc_output = generate_output_diagnostics(ctx, output),
metadata = rust_metadata,
Expand Down
3 changes: 1 addition & 2 deletions rust/private/rustc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def collect_deps(
Args:
deps (list): The deps from ctx.attr.deps.
proc_macro_deps (list): The proc_macro deps from ctx.attr.proc_macro_deps.
aliases (dict): A dict mapping aliased targets to their actual Crate information.
aliases (dict[Label, str]): A dict mapping aliased targets to their actual Crate information.

Returns:
tuple: Returns a tuple of:
Expand Down Expand Up @@ -270,7 +270,6 @@ def collect_deps(
cc_info = dep_variant_info.cc_info,
))

aliases = {k.label: v for k, v in aliases.items()}
for dep in crate_deps:
(crate_info, dep_info) = _get_crate_and_dep_info(dep)
cc_info = _get_cc_info(dep)
Expand Down