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 6 pull requests #71180

Merged
merged 25 commits into from
Apr 16, 2020
Merged

Rollup of 6 pull requests #71180

merged 25 commits into from
Apr 16, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

XAMPPRocky and others added 25 commits March 24, 2020 13:35
Co-Authored-By: LeSeulArtichaut <[email protected]>
Co-Authored-By: Mark Rousskov <[email protected]>
Co-Authored-By: Mark Rousskov <[email protected]>
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
Co-Authored-By: Jason King <[email protected]>
Co-Authored-By: Joshua M. Clulow <[email protected]>
The ioctl(FIONBIO) method of setting a file descriptor to be
non-blocking does not notify the underlying resource in the same way
that fcntl(F_SETFL, O_NONBLOCK) does on illumos and Solaris.
Do not ICE in the face of invalid enum discriminant

Fix rust-lang#67377.

r? @pnkfelix
…ls, r=ollie27

End cleanup on rustdoc-js tools

Fixes rust-lang#70689.

It removes a lot of code, which is pretty nice. :3

We now only have one entry point and a small set of options.

r? @ollie27
…llie27

Improve rustdoc source code a bit

Very small clean up. I realized that there were too many nested conditions whereas we could just use `and_then`.

r? @kinnison

cc @ollie27
Add illumos triple

This fixes rust-lang#55553 and adds support for `illumos` as a `target_os` on `x86_64`.  In addition to the compile spec and libstd additions, several library dependencies have been bumped in order to permit working builds of cargo and rustup for the new target.

Work originally started by @jasonbking, with subsequent additions by @pfmooney and @jclulow.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Apr 15, 2020

📌 Commit 41dc51e has been approved by Dylan-DPC

@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 15, 2020
@bors
Copy link
Contributor

bors commented Apr 15, 2020

⌛ Testing commit 41dc51e with merge ce1ab35...

@bors
Copy link
Contributor

bors commented Apr 16, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing ce1ab35 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2020
@bors bors merged commit ce1ab35 into rust-lang:master Apr 16, 2020
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.

7 participants