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 7 pull requests #107601

Merged
merged 17 commits into from
Feb 2, 2023
Merged

Rollup of 7 pull requests #107601

merged 17 commits into from
Feb 2, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillot and others added 17 commits January 31, 2023 17:49
This now uses `node_to_string` for both missing and seen Ids, which includes
the snippet of code for which the Id was allocated.
Also removes the duplicated printing of `HirId`, as `node_to_string` includes that already.
Similarly, changes all other users of `node_to_string` that do so, and changes the output of `node_to_string`, which is now "$hirid ($what `$span` in $path)".
…-field-pat, r=jackh726

Recover `_` as `..` in field pattern
…, r=estebank

Improve diagnostic for missing space in range pattern

Improves the diagnostic in rust-lang#107425 by turning it into a note explaining the parsing issue.

r? `@compiler-errors`
…errors

Improve pretty-printing of `HirIdValidator` errors

This now uses `node_to_string` for both missing and seen Ids, which includes the snippet of code for which the Id was allocated. Also removes the duplicated printing of `HirId`, as `node_to_string` also includes that.
Remove both StorageLive and StorageDead in CopyProp.

Fixes rust-lang#107511

rust-lang#106908 removed StorageDead without the accompanying StorageLive. In loops, execution would see repeated StorageLive, without any StorageDead, which is UB.

So when removing storage statements, we have to remove both StorageLive and StorageDead.

~I also added a MIR validation pass for StorageLive. It may be a bit overzealous.~
…ninhabited, r=jackh726

Erase regions before doing uninhabited check in borrowck

~Also, fingerprint query keys/values when debug assertions are enabled. This should make it easier to check for issues like this without `-Cincremental`, and make UI tests a bit cleaner.~ edit: moving that to a separate PR

Fixes rust-lang#107505
Rename `rust_2015` → `is_rust_2015`

r? ```@compiler-errors```
rust-lang#107508 (comment)
…=jyn514

Reinstate the `hir-stats.rs` tests on stage 1.

r? ```@the8472```
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Feb 2, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Feb 2, 2023

📌 Commit 08181ea has been approved by matthiaskrgr

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 Feb 2, 2023
@bors
Copy link
Contributor

bors commented Feb 2, 2023

⌛ Testing commit 08181ea with merge f312650...

@bors
Copy link
Contributor

bors commented Feb 2, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 2, 2023
@bors bors merged commit f312650 into rust-lang:master Feb 2, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 2, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#107577 cb25410a0952b76abe75248e1a7b4868d982237f
#107559 95b81c9d8808c1a5d73fb1499a2a2d054e8c7bb4
#107532 2337ffdeed5cd3ab508ae7ae1a4348502b9370be
#107524 abc4d2dd1d9afc78d18b4b3f6bed9fc055500f0b
#107515 54a1349ed714288464808f046061eac5d2ce1c51
#107493 25bfa0eba5ee0fe81165f4ae9f2ecfd1aa12a1e6
#106919 6142b479727387da85ec760f69c9219d1da066b1

previous master: 97872b792c

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 (f312650): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)
2.1% [1.1%, 3.1%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.1% [1.1%, 3.1%] 2

Cycles

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

@matthiaskrgr matthiaskrgr deleted the rollup-07zaafe branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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