Skip to content

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

liigo and others added 22 commits May 20, 2021 18:11
this properly encodes cross-crate constness data.
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 <[email protected]>
@rustbot rustbot added the rollup A PR which is a rollup label Jun 30, 2021
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Jun 30, 2021

📌 Commit 9e007e7 has been approved by JohnTitor

@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 Jun 30, 2021
@bors
Copy link
Collaborator

bors commented Jun 30, 2021

⌛ Testing commit 9e007e7 with merge a20f523467d8b1c06562e1c097d4da426d56287e...

@bors
Copy link
Collaborator

bors commented Jun 30, 2021

💔 Test failed - checks-actions

@bors 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 bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2021
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@JohnTitor
Copy link
Member Author

@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 Jun 30, 2021
@bors
Copy link
Collaborator

bors commented Jul 1, 2021

⌛ Testing commit 9e007e7 with merge 866335b...

@bors
Copy link
Collaborator

bors commented Jul 1, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 866335b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 1, 2021
@bors bors merged commit 866335b into rust-lang:master Jul 1, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 1, 2021
@JohnTitor JohnTitor deleted the rollup-acevhz7 branch July 1, 2021 07:35
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.