Skip to content
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

Rollup of 7 pull requests #70826

Merged
merged 22 commits into from
Apr 6, 2020
Merged

Rollup of 7 pull requests #70826

merged 22 commits into from
Apr 6, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 5, 2020

Successful merges:

Failed merges:

r? @ghost

stlankes and others added 22 commits March 30, 2020 06:49
The implementation is similiar to macOS solution doesn't
depend on additional OS support
These labels were probably moved around when rustfmt was introduced.
move OS constants to platform crate

to reduce platform specific constants move O_RDONLY etc. and the definition of thread priorities to hermit-abi
Do not lose or reorder user-provided linker arguments

Linker arguments are potentially order-dependent, so the order in which `-C link-arg` and `-C link-args` options are passed to `rustc` should be preserved when they are passed further to the linker.

Also, multiple `-C link-args` options are now appended to each other rather than overwrite each other.

In other words, `-C link-arg=a -C link-args="b c" -C link-args="d e" -C link-arg=f` is now passed as `"a" "b" "c" "d" "e" "f"` and not as `"d" "e" "a" "f"`.

Addresses rust-lang#70505 (comment).
Match options directly in the Fuse implementation

Rather than using `as_ref()`, `as_mut()`, and `?`, we can use `match` directly to save a lot of generated code. This was mentioned as a possibility in rust-lang#70366 (comment), and I found that it had a very large impact on rust-lang#70332 using `Fuse` within `Chain`. Let's evaluate this change on its own first.
…lnay

Stop importing the float modules in documentation

Follow up to rust-lang#69860. I realized I had not searched for and fixed this for the float values. So with this PR they also use the associated constants instead of the module level constants.

For the documentation where it also was using the `consts` submodule I opted to change it to import that directly. This becomes more in line with how other docs that use the `consts` submodule looks. And it also makes it so there are not two `f32` or `f64` things in the current namespace (both the module and the primitive type) and then hopefully confusing documentation readers less.

r? @dtolnay
Simplify dtor registration for HermitCore by using a list of destructors

The implementation is similar to the macOS version and doesn't depend on additional OS support
…-imports, r=Mark-Simulacrum

Remove marker comments in libstd/lib.rs macro imports

These comments were probably moved around when rustfmt was introduced. They don't correctly denote what they were intended for, so I propose we remove them instead. Thanks!
@Centril
Copy link
Contributor Author

Centril commented Apr 5, 2020

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Apr 5, 2020

📌 Commit 23acf87 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 5, 2020
@bors
Copy link
Contributor

bors commented Apr 5, 2020

⌛ Testing commit 23acf87 with merge 83f8c02...

@bors
Copy link
Contributor

bors commented Apr 6, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 83f8c02 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 6, 2020
@bors bors merged commit 83f8c02 into rust-lang:master Apr 6, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #70826!

Tested on commit 83f8c02.
Direct link to PR: #70826

💔 rls on linux: test-pass → test-fail (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 6, 2020
Tested on commit rust-lang/rust@83f8c02.
Direct link to PR: <rust-lang/rust#70826>

💔 rls on linux: test-pass → test-fail (cc @Xanewok).
@Centril Centril deleted the rollup-yn0hc1h branch April 6, 2020 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants