rustc_target: Further cleanup use of target options #78875
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
rust-highfive
added
the
S-waiting-on-review
|
@petrochenkov you mean 2 and 4? |
|
@bors r+ |
|
📌 Commit e0a94f27913c9b2c476922aa47844d9375313a98 has been approved by |
bors
added
S-waiting-on-bors
est31
reviewed
Nov 8, 2020
with an eye on merging `TargetOptions` into `Target`. `TargetOptions` as a separate structure is mostly an implementation detail of `Target` construction, all its fields logically belong to `Target` and available from `Target` through `Deref` impls.
`target.target_endian` -> `target.endian` `target.target_c_int_width` -> `target.c_int_width` `target.target_os` -> `target.os` `target.target_env` -> `target.env` `target.target_vendor` -> `target.vendor` `target.target_family` -> `target.os_family` `target.target_mcount` -> `target.mcount`
petrochenkov
force-pushed
the
cleantarg
branch
from
e0a94f2
to
7f91175
Compare
|
@bors r=Mark-Simulacrum |
|
📌 Commit 7f91175 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 11, 2020
…as-schievink Rollup of 14 pull requests Successful merges: - rust-lang#76765 (Make it more clear what an about async fn's returns when referring to what it returns) - rust-lang#78574 (Use check-pass instead of build-pass in regions ui test suite) - rust-lang#78669 (Use check-pass instead of build-pass in some consts ui test suits) - rust-lang#78847 (Assert that a return place is not used for indexing during integration) - rust-lang#78854 (Workaround for "could not fully normalize" ICE ) - rust-lang#78875 (rustc_target: Further cleanup use of target options) - rust-lang#78887 (Add comments to explain memory usage optimization) - rust-lang#78890 (comment attribution fix) - rust-lang#78896 (Clarified description of write! macro) - rust-lang#78897 (Add missing newline to error message of the default OOM hook) - rust-lang#78898 (add regression test for rust-lang#78892) - rust-lang#78908 ((rustdoc) [src] link for types defined by macros shows invocation, not defintion) - rust-lang#78910 (Fix links to stabilized versions of some intrinsics) - rust-lang#78912 (Add macro test for min-const-generics) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This was referenced Nov 11, 2020
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Nov 15, 2020
rustc_target: Fix dash vs underscore mismatches in option names Fixes rust-lang#78981 (regression from rust-lang#78875, the old option names used dashes)
bjorn3
pushed a commit
to bjorn3/rust
that referenced
this pull request
Nov 27, 2020
…lacrum rustc_target: Further cleanup use of target options Follow up to rust-lang#77729. Implements items 2 and 4 from the list in rust-lang#77729 (comment). The first commit collapses uses of `target.options.foo` into `target.foo`. The second commit renames some target options to avoid tautology: `target.target_endian` -> `target.endian` `target.target_c_int_width` -> `target.c_int_width` `target.target_os` -> `target.os` `target.target_env` -> `target.env` `target.target_vendor` -> `target.vendor` `target.target_family` -> `target.os_family` `target.target_mcount` -> `target.mcount` r? `@Mark-Simulacrum`
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.
Follow up to #77729.
Implements items 2 and 4 from the list in #77729 (comment).
The first commit collapses uses of
target.options.foointotarget.foo.The second commit renames some target options to avoid tautology:
target.target_endian->target.endiantarget.target_c_int_width->target.c_int_widthtarget.target_os->target.ostarget.target_env->target.envtarget.target_vendor->target.vendortarget.target_family->target.os_familytarget.target_mcount->target.mcountr? @Mark-Simulacrum