Skip to content

Rollup of 6 pull requests #94453

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

Merged
merged 14 commits into from
Feb 28, 2022
Merged

Rollup of 6 pull requests #94453

merged 14 commits into from
Feb 28, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Veeupup and others added 14 commits December 29, 2021 18:01
* Recover from invalid `'label: ` before block.
* Make suggestion to enclose statements in a block multipart.
* Point at `match`, `while`, `loop` and `unsafe` keywords when failing
  to parse their expression.
* Do not suggest `{ ; }`.
* Do not suggest `|` when very unlikely to be what was wanted (in `let`
  statements).
fix typo in btree/vec doc: Self -> self

this pr fixes rust-lang#92345
the documentation refers to the object the method is called for, not the type, so it should be using the lower case self.
Tweak diagnostics

* Recover from invalid `'label: ` before block.
* Make suggestion to enclose statements in a block multipart.
* Point at `match`, `while`, `loop` and `unsafe` keywords when failing
  to parse their expression. (Fix rust-lang#92705.)
* Do not suggest `{ ; }`.
* Do not suggest `|` when very unlikely to be what was wanted (in `let`
  statements).
…delay, r=petrochenkov

Fix ICE when passing block to while-loop condition

We were incorrectly delaying a bug when we passed _any_ block (that evaluated to `()`) to a while loop. This PR makes the check a bit more sophisticated.

We should only suppress the error here in cases that are equivalent to those we find in rust-lang#93574 (i.e. only while loop conditions that have destructuring assignment expressions in them).

Fixes rust-lang#93997
cc `@estebank` who added this code

I would not be opposed to removing the delay-bug altogether, and just emitting this error always. I much prefer duplicate errors over no errors.
Fix ICE when using Box<T, A> with large A

A sequel to rust-lang#94043 that fixes rust-lang#81270 and rust-lang#92054 (duplicate).
…=Urgau

Add long explanation for E0726

This is the cleaned up version of rust-lang#87655 with the missing fixes.

Part of rust-lang#61137.

r? `@Urgau`
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 28, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Feb 28, 2022

📌 Commit 34657cc has been approved by matthiaskrgr

@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 Feb 28, 2022
@bors
Copy link
Collaborator

bors commented Feb 28, 2022

⌛ Testing commit 34657cc with merge 4ce3749...

@bors
Copy link
Collaborator

bors commented Feb 28, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4ce3749 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2022
@bors bors merged commit 4ce3749 into rust-lang:master Feb 28, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 28, 2022
@bors bors mentioned this pull request Mar 1, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4ce3749): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

# for free to join this conversation on GitHub. Already have an account? # 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants