-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 8 pull requests #86757
Merged
Merged
Rollup of 8 pull requests #86757
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
this properly encodes cross-crate constness data.
Found in Rust-for-Linux/linux#402. Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
the foundation owns rust trademarks
Fix typo and improve documentation for E0632 Edit: After rust-lang#85520 (comment), this PR has been boiled down to just an extended description for `E0632` and a fixed typo.
…enkov Improve error for missing -Z with debugging option Before: ```text ❯ rustc --unpretty=hir error: Unrecognized option: 'unpretty' ``` After: ```text ❯ rustc --unpretty=hir error: Unrecognized option: 'unpretty'. Did you mean `-Z unpretty`? ```
…tichaut Check node kind to avoid ICE in `check_expr_return()` This PR fixes rust-lang#86721. The ICE described there is apparently due to a misunderstanding: https://github.com/rust-lang/rust/blob/e98897e5dc9898707bf4331c43b2e76ab7e282fe/compiler/rustc_typeck/src/check/expr.rs#L684-L685 Intuitively, one would think that calling `expect_item()` after `get_parent_item()` should succeed, but as it turns out, `get_parent_item()` can also return foreign, trait, and impl items as well as crates, whereas `expect_item()` specifically expects a `Node::Item`. I have therefore added an extra check to prevent this ICE.
…chenkov copy rust-lld as ld in dist Fixes bug in rust-lang#85961. Linking seems to work for pure Rust projects, but not when a C library needs to be dynamically linked.
…=notriddle Fix rustdoc query type filter I realized while reviewing rust-lang#86659 that the type filter was broken on search so I'd prefer it to get merged before merging rust-lang#86659. r? `@notriddle`
…schievink Test cross-crate usage of `feature(const_trait_impl)` This PR does two things: - Fixes metadata not encoded properly for functions in const trait impls. - Adds tests for using const trait impls cross-crate with the feature gate on the user crate either enabled or disabled. AFAIK, this means we can now constify some trait impls in the standard library 🎉 See rust-lang#67792 for the tracking issue, cc `@oli-obk`
alloc: `RawVec<T, A>::shrink` can be in `no_global_oom_handling`. Found in Rust-for-Linux/linux#402. Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
@bors r+ rollup=never p=8 |
📌 Commit 9e007e7 has been approved by |
bors
added
the
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Jun 30, 2021
⌛ Testing commit 9e007e7 with merge a20f523467d8b1c06562e1c097d4da426d56287e... |
💔 Test failed - checks-actions |
bors
removed
the
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Jun 30, 2021
bors
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Jun 30, 2021
@bors retry |
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
Jun 30, 2021
☀️ Test successful - checks-actions |
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:
check_expr_return()
#86728 (Check node kind to avoid ICE incheck_expr_return()
)feature(const_trait_impl)
#86750 (Test cross-crate usage offeature(const_trait_impl)
)RawVec<T, A>::shrink
can be inno_global_oom_handling
. #86755 (alloc:RawVec<T, A>::shrink
can be inno_global_oom_handling
.)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup