Skip to content

[beta] backports #90938

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 32 commits into from
Nov 19, 2021
Merged

[beta] backports #90938

merged 32 commits into from
Nov 19, 2021

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Nov 16, 2021 •
edited
Loading

Additionally, this bumps the stage 0 compiler from beta to stable 1.56.1.

r? @Mark-Simulacrum

sunfishcode and others added 9 commits November 15, 2021 16:25
@sunfishcode @cuviper
Fix assertion failures in OwnedHandle with windows_subsystem.
f7acd9f 
As discussed in rust-lang#88576, raw handle values in Windows can be null, such
as in `windows_subsystem` mode, or when consoles are detached from a
process. So, don't use `NonNull` to hold them, don't assert that they're
not null, and remove `OwnedHandle`'s `repr(transparent)`. Introduce a
new `HandleOrNull` type, similar to `HandleOrInvalid`, to cover the FFI
use case.

(cherry picked from commit 3b97481)
@sunfishcode @cuviper
Fix Windows compilation errors.
2df9cc5 
(cherry picked from commit e102c2a)
@sunfishcode @cuviper
Document the valid values for HandleOrNull and HandleOrInvalid.
0693aa1 
(cherry picked from commit 5d79870)
@seanyoung @cuviper
Ensure that pushing empty path works as before
9654d52 
Fixes: rust-lang#89658
(cherry picked from commit 1bb399c)
@guswynn @cuviper
Feature gate and make must_not_suspend allow-by-default
427b6a7 
This lint is not yet ready for stable use, primarily due to false positives in edge
cases; we want to test it out more before stabilizing.

(cherry picked from commit 185fa56)
@cuviper
Only use clone3 when needed for pidfd
4b4b56d 
In rust-lang#89522 we learned that `clone3` is interacting poorly with Gentoo's
`sandbox` tool. We only need that for the unstable pidfd extensions, so
otherwise avoid that and use a normal `fork`.

(cherry picked from commit 85b55ce)
@cuviper
Update another comment on fork vs. clone3
aaa8f4e 
(cherry picked from commit fa2eee7)
@cuviper @joshtriplett
Also note tool expectations of fork vs clone3
462002b 
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
(cherry picked from commit 6edaaa6)
@cuviper
Revert "Do not call getpid wrapper after fork in tests"
d658d6d 
This reverts commit 12fbabd.

It was only needed because of using raw `clone3` instead of `fork`, but
we only do that now when a pidfd is requested.

(cherry picked from commit e96a0a8)
@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2021
@cuviper cuviper mentioned this pull request Nov 16, 2021
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Nov 16, 2021

📌 Commit 5818b3581bfc57cab8cafbb1e52c174c571090ca has been approved by Mark-Simulacrum

@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 Nov 16, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@cuviper
Copy link
Member Author

cuviper commented Nov 16, 2021

It seems I missed something in #90186, but it looks like a match to me, so perhaps the test is also assuming some other state that's changed since beta. I can't figure out how to run rustdoc-gui locally -- @GuillaumeGomez, can you suggest fixes?

@GuillaumeGomez
Copy link
Member

@cuviper: To run gui tests you first need to run npm install browser-ui-test in your rust repository, then x.py test src/test/rustdoc-gui.

@GuillaumeGomez
Copy link
Member

Also, the tests were very likely updated in the meantime because new things were added, which is why it's failing.

@bors
Copy link
Collaborator

bors commented Nov 16, 2021

⌛ Testing commit 5818b3581bfc57cab8cafbb1e52c174c571090ca with merge 20dcf5fd682b98ea526af7571aee5a3e2ebb04ef...

@rust-log-analyzer

This comment has been minimized.

# to view
@bors
Copy link
Collaborator

bors commented Nov 16, 2021

💔 Test failed - checks-actions

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

Looks like its the same problem as in #90561 ?

@flip1995 flip1995 mentioned this pull request Nov 16, 2021
Closed
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 17, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@cuviper
Copy link
Member Author

cuviper commented Nov 17, 2021

@bors retry

@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 Nov 17, 2021
@m-ou-se m-ou-se linked an issue Nov 17, 2021 that may be closed by this pull request
New panic with env_logger and with #[windows_subsystem = "windows"] #88576
Closed
@bors
Copy link
Collaborator

bors commented Nov 18, 2021

⌛ Testing commit 69b4a85 with merge 1564f7a4350638e42211c4236eda0a96c045d95e...

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 18, 2021
Closed
@bors
Copy link
Collaborator

bors commented Nov 18, 2021

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
cuviper and others added 2 commits November 18, 2021 10:38
@cuviper
Android is not GNU
4d156c3 
(cherry picked from commit a24e2ed)
@Amanieu @cuviper
Update llvm submodule
a4a72e7 
(cherry picked from commit 530cd5b)
@cuviper
Copy link
Member Author

cuviper commented Nov 18, 2021

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Nov 18, 2021

📌 Commit a4a72e7 has been approved by Mark-Simulacrum

@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 Nov 18, 2021
@bors
Copy link
Collaborator

bors commented Nov 19, 2021

⌛ Testing commit a4a72e7 with merge 7611e64...

@bors
Copy link
Collaborator

bors commented Nov 19, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 7611e64 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 19, 2021
@bors bors merged commit 7611e64 into rust-lang:beta Nov 19, 2021
@rustbot rustbot added this to the 1.57.0 milestone Nov 19, 2021
@cuviper cuviper deleted the beta-next branch November 19, 2021 14:35
This was referenced Nov 19, 2021
Closed
Closed
Closed
Closed
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

New panic with env_logger and with #[windows_subsystem = "windows"]