Remove unnecessary conditional cfg(target_os) for redox and vxworks#82712
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 3, 2021
Merged
Remove unnecessary conditional cfg(target_os) for redox and vxworks#82712bors merged 1 commit intorust-lang:masterfrom
cfg(target_os) for redox and vxworks#82712bors merged 1 commit intorust-lang:masterfrom
Conversation
…rks` `redox` and `vxworks` are part of target_family `unix`, thus `cfg(unix)` already implies `cfg(target_os="redox")` and `(target_os="vxworks")`
Contributor
|
r? @dtolnay (rust-highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit 738f736 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 3, 2021
Rollup of 10 pull requests Successful merges: - rust-lang#81223 ([rustdoc] Generate redirect map file) - rust-lang#82439 (BTree: fix untrue safety) - rust-lang#82469 (Use a crate to produce rustdoc tree comparisons instead of the `diff` command) - rust-lang#82589 (unix: Non-mutable bufs in send_vectored_with_ancillary_to) - rust-lang#82689 (meta: Notify Zulip for rustdoc nominated issues) - rust-lang#82695 (Revert non-power-of-two vector restriction) - rust-lang#82706 (use outer_expn_data() instead of outer_expn().expn_data()) - rust-lang#82710 (FloatToInit: Replacing round_unchecked_to --> to_int_unchecked) - rust-lang#82712 (Remove unnecessary conditional `cfg(target_os)` for `redox` and `vxworks`) - rust-lang#82713 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
redoxandvxworksare now part of target_familyunix, thuscfg(unix)already impliescfg(target_os="redox")andcfg(target_os="vxworks")rust/compiler/rustc_target/src/spec/redox_base.rs
Line 26 in 35dbef2
rust/compiler/rustc_target/src/spec/vxworks_base.rs
Line 27 in 35dbef2