Skip to content

Rollup of 3 pull requests - #117490

Closed
GuillaumeGomez wants to merge 8 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-n61mnqs
Closed

Rollup of 3 pull requests#117490
GuillaumeGomez wants to merge 8 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-n61mnqs

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillotand others added 8 commits November 1, 2023 11:02
…r-errors
Avoid the path trimming ICE lint in error reporting
Types or really anything in MIR should never be formatted without path trimming disabled, because its formatting often tries to construct trimmed paths. In this case, the lint turns a nice error report into an irrelevant ICE.
Do not assert in op_to_const.
`op_to_const` is used in `try_destructure_mir_constant_for_diagnostics`, which may encounter invalid constants created by optimizations and debugging.
r? `@oli-obk`
Fixesrust-lang#117368
…notriddle
Update minifier-rs version to 0.3.0
It fixesGuillaumeGomez/minifier-rs#105.
r? `@notriddle`
@rustbotrustbot 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 1, 2023
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=3

@bors

bors commented Nov 1, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 54ff731 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 Nov 1, 2023
@bors

bors commented Nov 1, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 54ff731 with merge e207611...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 1, 2023
…llaumeGomez
Rollup of 3 pull requests
Successful merges:
- rust-lang#117373 (Avoid the path trimming ICE lint in error reporting)
- rust-lang#117441 (Do not assert in op_to_const.)
- rust-lang#117488 (Update minifier-rs version to 0.3.0)
r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer

Copy link
Copy Markdown
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)
test [mir-opt] tests/mir-opt/inline/polymorphic_recursion.rs ... ok
failures:
---- [mir-opt] tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs stdout ----
85 StorageLive(_12);
86 StorageLive(_15);
87 _12 = discriminant(_6);
- switchInt(move _12) -> [0: bb7, 1: bb5, otherwise: bb6];
+ switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb2];
90 91 bb5: {
99 }
99 }
100 101 bb6: {
- unreachable;
- }
- - bb7: {
106 _5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
107 StorageDead(_15);
108 StorageDead(_12);
thread '[mir-opt] tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs' panicked at src/tools/compiletest/src/runtest.rs:4066:21:
thread '[mir-opt] tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs' panicked at src/tools/compiletest/src/runtest.rs:4066:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff
failures:
[mir-opt] tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs

@bors

bors commented Nov 1, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Nov 1, 2023
@GuillaumeGomez
GuillaumeGomez deleted the rollup-n61mnqs branch November 1, 2023 16:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

6 participants

@GuillaumeGomez@bors@rust-log-analyzer@rustbot@cjgillot@saethlin