Refactor rustc_compile_action #330
Merged
Conversation
This file contains 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
Functionally, this code should be identical. However, it (hopefully) is easier to read, and makes subcomponents of the rustc command (parsing args, env, etc) easier to generalize.
smklein
commented
Jun 10, 2020
Comment on lines
-370
to
-403
| # Make bin crate data deps available to tests. | ||
| for data in getattr(ctx.attr, "data", []): | ||
| if CrateInfo in data: | ||
| dep_crate_info = data[CrateInfo] | ||
| if dep_crate_info.type == "bin": | ||
| env["CARGO_BIN_EXE_" + dep_crate_info.output.basename] = dep_crate_info.output.short_path | ||
|
|
||
| # Update environment with user provided variables. | ||
| env.update(crate_info.rustc_env) |
There was a problem hiding this comment.
Pulled up into _rustc_compile_arguments
Comment on lines
-238
to
-264
| cc_toolchain = find_cpp_toolchain(ctx) | ||
|
|
There was a problem hiding this comment.
This was unused, and removed.
Comment on lines
-311
to
-337
| # We awkwardly construct this command because we cannot reference $PWD from ctx.actions.run(executable=toolchain.rustc) | ||
| out_dir = _create_out_dir_action(ctx, build_info.out_dir if build_info else None) |
There was a problem hiding this comment.
Pulled up into _rustc_compile_inputs
dfreese
reviewed
Jun 10, 2020
dfreese
approved these changes
Jun 11, 2020
mfarrugi
reviewed
Jun 12, 2020
rust/private/rustc.bzl
Outdated
| toolchain, | ||
| ) | ||
|
|
||
| compile_inputs, out_dir = _rustc_compile_inputs( |
There was a problem hiding this comment.
I think each of these subcommands should start w/ verbs, eg.
collect_deps
collect_inputs
construct_arguments etc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Functionally, this code should be identical.
However, it (hopefully) is easier to read, and makes
subcomponents of the rustc command (parsing args, env, etc)
easier to generalize.