-
Notifications
You must be signed in to change notification settings - Fork 13.2k
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
Rollup of 7 pull requests #84440
Conversation
This file contains 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
…ead of trait_ref_hack
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``
… r=cuviper Update LLVM submodule Fixes rust-lang#83467
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`.
@bors r+ rollup=never p=5 |
📌 Commit d1f5fc6 has been approved by |
☀️ Test successful - checks-actions |
This was referenced 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.
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:
ScopeTree::closure_tree
#84343 (RemoveScopeTree::closure_tree
)sys_common::rwlock::StaticRWLock
etc. tosys::unix::rwlock
#84402 (Movesys_common::rwlock::StaticRWLock
etc. tosys::unix::rwlock
)sys::args::Args::inner_debug
and useDebug
instead #84413 (Removesys::args::Args::inner_debug
and useDebug
instead)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup