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 6 pull requests #117098

Closed
wants to merge 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Noratrieb and others added 14 commits October 21, 2023 11:33
This simplifies the code by removing all the `self` assignments and
makes the flow of data clearer - always into the printer.
Especially in v0 mangling, which already used  `&mut self` in some
places, it gets a lot more uniform.
When these `Box<Generics>` types were introduced,
`Generics` was made with `Vec` and much larger.
Now that it's made with `ThinVec`, `Type` is bigger
and should be boxed instead.
Co-authored-by: León Orell Valerian Liehr <[email protected]>
I had apparently forgotten to update the Rust mailmap file for my previous commits!
Generate aggregate constants in DataflowConstProp.
…rinters, r=oli-obk

Make `ty::print::Printer` take `&mut self` instead of `self`

based on rust-lang#116815

This simplifies the code by removing all the `self` assignments and
makes the flow of data clearer - always into the printer.
Especially in v0 mangling, which already used  `&mut self` in some
places, it gets a lot more uniform.
return unfixed len if pat has reported error

- Fixes rust-lang#116186
- Fixes rust-lang#113021

This issue arises due to the creation of a fixed-length pattern, as a result of the mir body corruption. The corruption taints `tcx.eval_to_allocation_raw`, causing it to return `AlreadyReported`. Consequently, this prevents `len.try_eval_target_usize` from evaluating correctly and returns `None`. Lastly, it results in the return of `[usize; min_len]`.

To rectify this issue, my approach is that to return unfixed when encountering `ErrorHandled::Reported`. Additionally, in instances of `ErrorHandled::TooGeneric`, the previous logic has been reinstated.
rustdoc: wrap Type with Box instead of Generics

When these `Box<Generics>` types were introduced, `Generics` was made with `Vec` and much larger. Now that it's made with `ThinVec`, `Type` is bigger and should be boxed instead.
Remove smir from triage and add me to stablemir

As we discussed this in [weekly ](https://rust-lang.zulipchat.com/#narrow/stream/320896-project-stable-mir/topic/.5Bbi-weekly.5D.202023-10-20)meeting we don't really care for changes that happens in `smir`, we only care about changes that happen to `stable_mir` so I removed smir triage ping and added myself to `stable_mir` ping list
…lacrum

Update .mailmap to promote my livename

I had apparently forgotten to update the Rust mailmap file for my previous commits. I was sent here from [the about page!](https://thanks.rust-lang.org/about/).

Note that the second rule only fires for commits I do at my current place of work, but reclaim them under my personal email address that I expect to use for longer.
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. A-rustdoc-json Area: Rustdoc JSON backend 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 23, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Oct 23, 2023

📌 Commit 542397d 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 Oct 23, 2023
@bors
Copy link
Contributor

bors commented Oct 23, 2023

⌛ Testing commit 542397d with merge 2dd0f1a...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 23, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#115796 (Generate aggregate constants in DataflowConstProp.)
 - rust-lang#116859 (Make `ty::print::Printer` take `&mut self` instead of `self`)
 - rust-lang#117046 (return unfixed len if pat has reported error)
 - rust-lang#117070 (rustdoc: wrap Type with Box instead of Generics)
 - rust-lang#117074 (Remove smir from triage and add me to stablemir)
 - rust-lang#117086 (Update .mailmap to promote my livename)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [mir-opt] tests/mir-opt/dataflow-const-prop/struct.rs stdout ----
228       0x10 │ 00 00 a4 42                                     │ ...B
229   }
230   
-   ALLOC1 (size: 16, align: 4) {
+   ALLOC1 (size: 16, align: 8) {
232       00 00 00 00 00 80 46 40 00 00 00 00 00 00 52 40 │ [email protected]@
234   

thread '[mir-opt] tests/mir-opt/dataflow-const-prop/struct.rs' panicked at src/tools/compiletest/src/runtest.rs:4070:21:
thread '[mir-opt] tests/mir-opt/dataflow-const-prop/struct.rs' panicked at src/tools/compiletest/src/runtest.rs:4070:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff


failures:
    [mir-opt] tests/mir-opt/dataflow-const-prop/struct.rs

@bors
Copy link
Contributor

bors commented Oct 23, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues about the rust-lang/rust repository. A-rustdoc-json Area: Rustdoc JSON backend rollup A PR which is a rollup 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants