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 #113102

Merged
merged 15 commits into from
Jun 27, 2023
Merged

Rollup of 7 pull requests #113102

merged 15 commits into from
Jun 27, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

chenyukang and others added 15 commits June 11, 2023 14:36
…vidtwco

Detect actual span for getting unexpected token from parsing macros

Fixes rust-lang#112458
…davidtwco

Add suggestion for bad block fragment error

Makes it a bit clearer how to fix this parser restriction
…r=jyn514

bootstrap: rename 'user' profile to 'dist'

Fixes rust-lang#112074

Unfortunately a big chunk of the diff is adding `PartialEq/Eq/Debug` impls so we can `assert_eq` but I think better to have them in the long run.
For back compat, ensure `"maintainer"`, `"user"` and `"dist"` are all parsed as `Profile::Dist`.

r? `@jyn514`
cc `@AnakinSkywalkeer` who worked on the previous attempt at this
Use `CoverageKind::as_operand_id` instead of manually reimplementing it

These two pieces of code are functionally equivalent to the `CoverageKind::as_operand_id` method that already exists, and is already used elsewhere in this file.

This slightly reduces the amount of code that manually pattern-matches on `CoverageKind`.
…r=oli-obk

Export AnalysisResults trait in rustc_mir_dataflow

Followup to rust-lang#108293
Re-exports the new trait defined in mentioned PR to make ResultsCursor::seek_before_primary_effect, ResultsCursor::seek_after_primary_effect... usable again outside the compiler itself.
…hir, r=Nilstrieb

`thir`: Add `Become` expression kind

This PR is pretty small and just adds `thir::ExprKind::Become`. I didn't include the checks that will be done on thir, since they are much more complicated and can be done in parallel with with MIR (or, well, at least I believe they can).

r? `@Nilstrieb`
…i-obk

Remove unused struct and tweak format macro uses

This pul request removes an unused struct and tweaks `format!` uses.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 27, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jun 27, 2023

📌 Commit adc3ae2 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 Jun 27, 2023
@bors
Copy link
Contributor

bors commented Jun 27, 2023

⌛ Testing commit adc3ae2 with merge 5ea6668...

@bors
Copy link
Contributor

bors commented Jun 27, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 27, 2023
@bors bors merged commit 5ea6668 into rust-lang:master Jun 27, 2023
12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#112518 Detect actual span for getting unexpected token from parsin… 69f084ad6b608e889c35335d7c1985e32d6227bc (link)
#112978 Add suggestion for bad block fragment error d44d09ea50d21749f528233b245b8343c9e3e29b (link)
#113068 bootstrap: rename 'user' profile to 'dist' 702e7b055bd28a94487856395ebcea5e8efb4faa (link)
#113079 Use CoverageKind::as_operand_id instead of manually reimp… 79b57b24e31e7fb857bd1dfcc11d493b246fee46 (link)
#113089 Export AnalysisResults trait in rustc_mir_dataflow 57c405d207396d2231c99bbe61c4ebb6a306f850 (link)
#113093 thir: Add Become expression kind 7facbced81abe26d37a2f5936899a64d0436d939 (link)
#113096 Remove unused struct and tweak format macro uses 21c19becd721af89fe714615966ce3314eb5c41f (link)

previous master: 3c554f5cb4

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 (5ea6668): 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)
1.6% [0.7%, 2.9%] 15
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.6% [0.7%, 2.9%] 15

Cycles

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

Binary size

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

Bootstrap: 663.506s -> 661.601s (-0.29%)

@matthiaskrgr matthiaskrgr deleted the rollup-wpkbsw1 branch March 16, 2024 18:20
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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.

None yet