Skip to content
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 3 pull requests #110390

Merged
merged 8 commits into from
Apr 16, 2023
Merged

Conversation

fee1-dead
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ehuss and others added 8 commits April 15, 2023 14:43
This test was ignored long ago in
rust-lang#20578 when the syntax for
closures was changed.

The current status is that a closure with an explicit `!` return type
will trigger the `unreachable_code` lint which appears to be the
original intent of the test
(rust-lang#16836). A closure without a
return type won't trigger the lint since the `!` type isn't inferred
(AFAIK). This restores the test to its original form.
This test was fixed by rust-lang#65989
It makes for confusing code.

This was introduced in a large commit in rust-lang#67886 that rearranged a lot of
`use` statements. I suspect it was an accident.
Convert comment to doc comment on `Interner::get`.
…rrors

Update some ignored tests.

This unignores some tests which no longer need to be ignored (see individual commits for reasons why). This also adds some descriptions to why tests are ignored so they can be seen in the test output.
…t, r=fee1-dead

Don't `use rustc_hir as ast`(!)

It makes for confusing code.

This was introduced in a large commit in rust-lang#67886 that rearranged a lot of `use` statements. I suspect it was an accident.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 16, 2023
@fee1-dead
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Apr 16, 2023

📌 Commit 312cad1 has been approved by fee1-dead

It is now in the queue for this repository.

@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 Apr 16, 2023
@bors
Copy link
Contributor

bors commented Apr 16, 2023

⌛ Testing commit 312cad1 with merge e6e956d...

@bors
Copy link
Contributor

bors commented Apr 16, 2023

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing e6e956d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2023
@bors bors merged commit e6e956d into rust-lang:master Apr 16, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 16, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110387 2fb84df3e450dd025a0f73aae2a147e55bec3c6b
#110379 1cfaf43396162448f837f1aaee31882c6b96543f
#110376 ae0c5a80c5a1b01bb00bf8867c65174d6df2e488

previous master: 2a71115261

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e6e956d): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
-4.5% [-4.5%, -4.5%] 1
Improvements ✅
(secondary)
-2.2% [-2.8%, -1.5%] 4
All ❌✅ (primary) -4.5% [-4.5%, -4.5%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@fee1-dead fee1-dead deleted the rollup-kh2ov9r branch April 16, 2023 13:06
@fee1-dead
Copy link
Member Author

Regression is subsequently reverted by #110391 (comment)

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. 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.

7 participants