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

Fix WinUWP std compilation errors due to I/O safety #88587

Merged
merged 2 commits into from
Sep 23, 2021

Conversation

bdbai
Copy link
Contributor

@bdbai bdbai commented Sep 2, 2021

I/O safety for Windows has landed in #87329. However, it does not cover UWP specific parts and prevents all UWP targets from building. See YtFlow/Maple#18. This PR fixes these compile errors when building std for UWP targets.

@rust-highfive
Copy link
Collaborator

r? @yaahc

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 2, 2021
@bdbai
Copy link
Contributor Author

bdbai commented Sep 2, 2021

r? @joshtriplett

@rust-highfive rust-highfive assigned joshtriplett and unassigned yaahc Sep 2, 2021
@the8472 the8472 added T-libs Relevant to the library team, which will review and decide on the PR/issue. O-windows Operating system: Windows labels Sep 8, 2021
@cuviper cuviper added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 14, 2021
@m-ou-se m-ou-se added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 22, 2021
@joshtriplett
Copy link
Member

Seems reasonable. get_handle is handling the invalid and null cases, so the unsafe block seems fine. I'd like to have a // SAFETY comment above the unsafe blocks. With that comment added, r=me.

@joshtriplett
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 22, 2021

📌 Commit 4e01157 has been approved by joshtriplett

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 22, 2021
@bors
Copy link
Contributor

bors commented Sep 23, 2021

⌛ Testing commit 4e01157 with merge 15d9ba0...

@bors
Copy link
Contributor

bors commented Sep 23, 2021

☀️ Test successful - checks-actions
Approved by: joshtriplett
Pushing 15d9ba0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2021
@bors bors merged commit 15d9ba0 into rust-lang:master Sep 23, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 23, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (15d9ba0): comparison url.

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

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

@rustbot label: -perf-regression

ehuss pushed a commit to ehuss/rust that referenced this pull request Oct 4, 2021
Fix WinUWP std compilation errors due to I/O safety

I/O safety for Windows has landed in rust-lang#87329. However, it does not cover UWP specific parts and prevents all UWP targets from building. See YtFlow/Maple#18. This PR fixes these compile errors when building std for UWP targets.
@ehuss ehuss mentioned this pull request Oct 4, 2021
@ehuss ehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2021
[beta] Beta rollup

* Fix WinUWP std compilation errors due to I/O safety rust-lang#88587
* Disable RemoveZsts in generators to avoid query cycles rust-lang#88979
* Disable the evaluation cache when in intercrate mode rust-lang#88994
* Fix linting when trailing macro expands to a trailing semi rust-lang#88996
* Don't use projection cache or candidate cache in intercrate mode rust-lang#89125
* 2229: Mark insignificant dtor in stdlib rust-lang#89144
* Temporarily rename int_roundings functions to avoid conflicts rust-lang#89184
* [rfc 2229] Drop fully captured upvars in the same order as the regular drop code rust-lang#89208
* Use the correct edition for syntax highlighting doctests rust-lang#89277
* Don't normalize opaque types with escaping late-bound regions rust-lang#89285
* Update Let's Encrypt ROOT CA certificate in dist-(i686|x86_64)-linux docker images rust-lang#89486

Cargo update:
* - [beta] 1.56 backports (rust-lang/cargo#9958)
* - [beta] Revert "When a dependency does not have a version, git or path… (rust-lang/cargo#9912)
* - [beta] Fix rustc --profile=dev unstable check. (rust-lang/cargo#9901)
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.57.0, 1.56.0 Oct 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.