Skip to content

Rollup of 4 pull requests - #97063

Merged
bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-u5el7hb
May 15, 2022
Merged

Rollup of 4 pull requests#97063
bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-u5el7hb

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

sunfishcodeand others added 11 commits May 11, 2022 07:26
PR rust-lang#94586 added support for using
`rustc_nonnull_optimization_guaranteed` on values where the "null" value
is the all-ones bitpattern.
Now that rust-lang#94586 has made it to the stage0 compiler, add
`rustc_nonnull_optimization_guaranteed` to `OwnedFd`, `BorrowedFd`,
`OwnedSocket`, and `BorrowedSocket`, since these types all exclude
all-ones bitpatterns.
This allows `Option<OwnedFd>`, `Option<BorrowedFd>`, `Option<OwnedSocket>`,
and `Option<BorrowedSocket>` to be used in FFI declarations, as described
in the [I/O safety RFC].
[I/O safety RFC]: https://github.com/rust-lang/rfcs/blob/master/text/3128-io-safety.md#ownedfd-and-borrowedfdfd-1
I added this note, because if you forget the `--target` flags, you get a really ugly error message.
rust-lang/cargo#10666
…ll-optimization-guaranteed, r=joshtriplett
Add rustc_nonnull_optimization_guaranteed to Owned/Borrowed Fd/Socket
PR rust-lang#94586 added support for using
`rustc_nonnull_optimization_guaranteed` on values where the "null" value
is the all-ones bitpattern.
Now that rust-lang#94586 has made it to the stage0 compiler, add
`rustc_nonnull_optimization_guaranteed` to `OwnedFd`, `BorrowedFd`,
`OwnedSocket`, and `BorrowedSocket`, since these types all exclude
all-ones bitpatterns.
This allows `Option<OwnedFd>`, `Option<BorrowedFd>`, `Option<OwnedSocket>`,
and `Option<BorrowedSocket>` to be used in FFI declarations, as described
in the [I/O safety RFC].
[I/O safety RFC]: https://github.com/rust-lang/rfcs/blob/master/text/3128-io-safety.md#ownedfd-and-borrowedfdfd-1
Added note in documentation
I added this note, because if you forget the `--target` flags, you get a really ugly error message.
rust-lang/cargo#10666
…r=notriddle
Add new eslint rule about brace style
It also prevents one liners.
r? `@notriddle`
Fix use of SetHandleInformation on UWP
The use of `SetHandleInformation` (introduced in rust-lang#96441 to make `HANDLE` inheritable) breaks UWP builds because it is not available for UWP targets.
Proposed workaround: duplicate the `HANDLE` with `inherit = true` and immediately close the old one. Traditional Windows Desktop programs are not affected.
cc `@ChrisDenton`
@rustbotrustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 15, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented May 15, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit d56c59e has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 15, 2022
@bors

bors commented May 15, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d56c59e with merge 29e972d...

@bors

bors commented May 15, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 29e972d to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 15, 2022
@bors
bors merged commit 29e972d into rust-lang:masterMay 15, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 15, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (29e972d): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Dylan-DPC@bors@rust-timer@rustbot@sunfishcode@Volker-Weissmann@GuillaumeGomez@bdbai