Skip to content

Conversation

WaffleLapkin
Copy link
Member

It seems that we already have a enum-discriminant with more tests, so it makes sense to merge them.

@rustbot
Copy link
Collaborator

rustbot commented May 29, 2023

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@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. labels May 29, 2023
@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 29, 2023
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 29, 2023

📌 Commit 00617dc8e5982dd1eb1f567fbf6a102c1ea80c19 has been approved by compiler-errors

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 May 29, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 29, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#111558 (Move tests)
 - rust-lang#111827 (Add build instructions for cranelift backend as part of Rust repo)
 - rust-lang#111988 (Make `TyKind: Debug` have less verbose output)
 - rust-lang#112022 (Check nested obligations during coercion unify in new solver)
 - rust-lang#112057 (Suggest correct `self_ty`)
 - rust-lang#112063 (Add a test for issue 110457/incremental ICE with closures with the same span)

Failed merges:

 - rust-lang#112068 (Move tests from `ui/discrim` dir)

r? `@ghost`
`@rustbot` modify labels: rollup
@WaffleLapkin
Copy link
Member Author

@bors r-

This has conflicts with master and conflicts with #112071, so let's wait here.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the move-discrim-tests branch from 00617dc to 7b8e8ad Compare June 8, 2023 12:58
@WaffleLapkin
Copy link
Member Author

@bors r=compiler-errors rollup=never

@bors
Copy link
Collaborator

bors commented Jun 8, 2023

📌 Commit 7b8e8ad has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 8, 2023
@bors
Copy link
Collaborator

bors commented Jun 8, 2023

⌛ Testing commit 7b8e8ad with merge 8b35c0b...

@bors
Copy link
Collaborator

bors commented Jun 8, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 8b35c0b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2023
@bors bors merged commit 8b35c0b into rust-lang:master Jun 8, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 8, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8b35c0b): 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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.7% [-3.4%, -2.1%] 4
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -2.7% [-3.4%, -2.1%] 4

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: 648.127s -> 649.476s (0.21%)

@WaffleLapkin WaffleLapkin deleted the move-discrim-tests branch June 1, 2025 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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.

7 participants