Rollup of 4 pull requests#71175
Closed
Dylan-DPC-zz wants to merge 10 commits intorust-lang:masterfrom
Closed
Conversation
…ning `Result` and vice-versa
Co-Authored-By: Jason King <jason.brian.king@gmail.com> Co-Authored-By: Joshua M. Clulow <jmc@oxide.computer>
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.
…ning `Result` and vice-versa
Do not ICE in the face of invalid enum discriminant Fix rust-lang#67377. r? @pnkfelix
Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa Fixes rust-lang#71089
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.
…an-DPC Clean up E0518 explanation r? @Dylan-DPC
Author
|
@bors r+ rollup=never p=4 (let the toolstate ones go first) |
Collaborator
|
📌 Commit ce76bcb has been approved by |
bors
added
the
S-waiting-on-bors
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.
Successful merges:
?onOptionin fn returningResultand vice-versa #71141 (Provide better compiler output when using?onOptionin fn returningResultand vice-versa)Failed merges:
r? @ghost