Skip to content

Rollup of 6 pull requests - #86690

Merged
bors merged 13 commits into
rust-lang:masterfrom
JohnTitor:rollup-4ukk4yw
Jun 28, 2021
Merged

Rollup of 6 pull requests#86690
bors merged 13 commits into
rust-lang:masterfrom
JohnTitor:rollup-4ukk4yw

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

FabianWolffand others added 13 commits June 11, 2021 01:20
…ulacrum
Fix type checking of return expressions outside of function bodies
This pull request fixesrust-lang#86188. The problem is that the current code for type-checking `return` expressions stops if the `return` occurs outside of a function body, while the correct behavior is to continue type-checking the return value expression (otherwise an ICE happens later on because variables declared in the return value expression don't have a type).
Also, I have noticed that it is sometimes not obvious why a `return` is outside of a function body; for instance, in the example from rust-lang#86188 (which currently causes an ICE):
```rust
fn main() {
[(); return || {
let tx;
}]
}
```
I have changed the error message to also explain why the `return` is considered outside of the function body:
```
error[E0572]: return statement outside of function body
--> ice0.rs:2:10
|
1 | / fn main() {
2 | | [(); return || {
| |__________^
3 | || let tx;
4 | || }]
| ||_____^ the return is part of this body...
5 | | }
| |_- ...not the enclosing function body
```
…lacrum
Don't dist miri or rust-analyzer on stable or beta.
This prevents miri and rust-analyzer from being built for "dist" or "install" on the stable/beta channels. It is a nightly-only tool and should not be included.
Closesrust-lang#86286
…Mark-Simulacrum
Allow anyone to set `perf-regression` label
The main purpose is to allow the triage bot to set the label: rust-lang#86617 (comment)
r? `@Mark-Simulacrum`
Add a regression test for issue-65384
Closesrust-lang#65384
r? `@jackh726`
@rustbotrustbot added the rollup A PR which is a rollup label Jun 28, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Jun 28, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit c5055b7 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 28, 2021
@bors

bors commented Jun 28, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c5055b7 with merge a435b49...

@bors

bors commented Jun 28, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2021
@bors
bors merged commit a435b49 into rust-lang:masterJun 28, 2021
@rustbotrustbot added this to the 1.55.0 milestone Jun 28, 2021
@JohnTitor
JohnTitor deleted the rollup-4ukk4yw branch June 28, 2021 19:25
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

7 participants

@JohnTitor@bors@rustbot@FabianWolff@ehuss@klensy@lnicola