Simplify cfg(any(unix, target_os="redox")) in example to just cfg(unix)#85409
Merged
bors merged 1 commit intorust-lang:masterfrom May 17, 2021
Merged
Simplify cfg(any(unix, target_os="redox")) in example to just cfg(unix)#85409bors merged 1 commit intorust-lang:masterfrom
cfg(any(unix, target_os="redox")) in example to just cfg(unix)#85409bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors r+ rollup=always |
Collaborator
|
📌 Commit 3836427 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#85087 (`eval_fn_call`: check the ABI of `body.source`) - rust-lang#85302 (Expand WASI abbreviation in docs) - rust-lang#85355 (More tests for issue-85255) - rust-lang#85367 (Fix invalid input:disabled CSS selector) - rust-lang#85374 (mark internal inplace_iteration traits as hidden) - rust-lang#85408 (remove size field from Allocation) - rust-lang#85409 (Simplify `cfg(any(unix, target_os="redox"))` in example to just `cfg(unix)`) - rust-lang#85412 (remove some functions that were only used by Miri) 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
6 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.
Update example for
OsStringthat handledredoxseperately fromunix: Redox has been completely integrated undertarget_family="unix", socfg(unix)impliestarget_os="redox"rust/compiler/rustc_target/src/spec/redox_base.rs
Line 26 in 35dbef2