-
Notifications
You must be signed in to change notification settings - Fork 58
test: verify Cargo cfgs for all supported triples #205
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.
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
Open
Geethree
wants to merge
1
commit into
hermeticbuild:main
Choose a base branch
from
Geethree:test/cargo-cfg-all-triples
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| """Hermetically generates Cargo cfg oracle data from the registered rustc.""" | ||
|
|
||
| def _cfg_oracle_data_impl(ctx): | ||
| rustc_info = ctx.attr._rustc[DefaultInfo] | ||
| rustc_files = rustc_info.files.to_list() | ||
| if len(rustc_files) != 1: | ||
| fail("expected exactly one rustc executable, got {}".format(rustc_files)) | ||
|
|
||
| output = ctx.outputs.output | ||
| args = ctx.actions.args() | ||
| args.add("--rustc", rustc_files[0]) | ||
| args.add("--output", output) | ||
| args.add_all(ctx.attr.triples, before_each = "--triple") | ||
|
|
||
| ctx.actions.run( | ||
| arguments = [args], | ||
| executable = ctx.executable._generator, | ||
| mnemonic = "GenerateCargoCfgOracle", | ||
| outputs = [output], | ||
| progress_message = "Generating Cargo cfg oracle data for %{label}", | ||
| tools = [depset(transitive = [rustc_info.files, rustc_info.default_runfiles.files])], | ||
| ) | ||
|
|
||
| return [DefaultInfo(files = depset([output]))] | ||
|
|
||
| cfg_oracle_data = rule( | ||
| implementation = _cfg_oracle_data_impl, | ||
| attrs = { | ||
| "triples": attr.string_list(mandatory = True), | ||
| "_generator": attr.label( | ||
| cfg = "exec", | ||
| default = Label("//tools/cfg_oracle:cfg_oracle_generator"), | ||
| executable = True, | ||
| ), | ||
| "_rustc": attr.label( | ||
| cfg = "exec", | ||
| default = Label("@rules_rust//rust/toolchain:current_rustc_files"), | ||
| ), | ||
| }, | ||
| outputs = { | ||
| "output": "%{name}.bzl", | ||
| }, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will run once per-cargo-closure. I wonder if its worth deduping the construciton of these contexts by lifting it higher in the graph and passing those in instead of the triples (since triples can be retrieved from them anyway?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The contexts are currently constructed once in resolve_cargo_workspace_members for each Cargo closure, then reused by the resolver and workspace dependency rendering; target-expression results are cached as well. Lifting them further would only deduplicate across closures with the same triple set, so I left that plumbing unchanged pending evidence that cross-closure construction is material.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd expect a typical bazel repo to have 5-15 closures (there are some internal ones for rules_rs, though I should probably merge to a single one...). so yeah maybe not a huge deal