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 7 pull requests #84440

Merged
merged 22 commits into from
Apr 22, 2021
Merged

Rollup of 7 pull requests #84440

merged 22 commits into from
Apr 22, 2021

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

camsteffen and others added 22 commits April 19, 2021 15:40
Return an error if coercing function items / non-capturing closures
to a common function pointer type would require reifying an intrinsic.
Remove `ScopeTree::closure_tree`

Seems to be dead code since rust-lang#50649.
…Gomez

Uses flex to fix formatting of h1 at any width

Fixes rust-lang#84354.
…omatsakis

Followup to rust-lang#83944

Some cleanups requested by ``@nikomatsakis``

r? ``@nikomatsakis``
Move `sys_common::rwlock::StaticRWLock` etc. to `sys::unix::rwlock`

This moves `sys_common::rwlock::StaticRwLock`, `RWLockReadGuard` and `RWLockWriteGuard` to `sys::unix::rwlock`. They are already `#[cfg(unix)]` and don't need to be in `sys_common`.
… r=Mark-Simulacrum

Check for intrinsics before coercing to a function pointer

Return an error if coercing function items / non-capturing closures
to a common function pointer type would require reifying an intrinsic.

Turns ICE reported in rust-lang#84297 into a proper error.
Remove `sys::args::Args::inner_debug` and use `Debug` instead

This removes the method `sys::args::Args::inner_debug` on all platforms and implements `Debug` for `Args` instead.

I believe this creates a more natural API for the different platforms under `sys`: export a type `Args: Debug + Iterator + ...` vs. `Args: Iterator + ...` and with a method `inner_debug`.
@rustbot rustbot added the rollup A PR which is a rollup label Apr 22, 2021
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 22, 2021

📌 Commit d1f5fc6 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 22, 2021
@bors
Copy link
Contributor

bors commented Apr 22, 2021

⌛ Testing commit d1f5fc6 with merge 5f1aeb5...

@bors
Copy link
Contributor

bors commented Apr 22, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 22, 2021
@bors bors merged commit 5f1aeb5 into rust-lang:master Apr 22, 2021
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. rollup A PR which is a rollup 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.

9 participants