some `derive_more` refactors #145145

fee1-dead · 2025-08-09T05:06:36Z

some clauses can be merged together without requiring an attribute for each trait derived.

also manually impl Eq because the derive_where generated code is too much for my comfort (cc ModProg/derive-where#128)

rustbot · 2025-08-09T05:06:40Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

jieyouxu

Thanks. The changes themselves look good. I do have a question re. if we want to add a comment about why we manually impl Eq, so someone later doesn't try to "clean up" the manual Eq impls... In any case, that's not really a blocking concern, so r=me with or without the comment.

jieyouxu · 2025-08-09T08:55:24Z

compiler/rustc_next_trait_solver/src/solve/inspect/build.rs

@@ -78,6 +78,8 @@ struct WipGoalEvaluation<I: Interner> {
    pub result: Option<QueryResult<I>>,
 }

+impl<I: Interner> Eq for WipGoalEvaluation<I> {}


Discussion: should we leave a comment about why the manual Eq derives somewhere?

Not sure if it will be worth it to sprinkle a comment everywhere. People attempting to go back to derives might wonder why there were manual impls so they'd look at the blame.. Or the reviewer could look at the blame.

I hope they do look at the blame... But yeah, good point about sprinkling them around. What I had in mind was having a single comment somewhere, but then it probably will just be never read again. So this is fine.

Are we going to return to using the derives instead of the manual impls once ModProg/derive-where#128 lands?

It will be better once my PR lands, yeah, so we could return to it, but unlike the built-in Eq derive which uses a single type AssertParamIsEq across all derives, the derive-where impl creates a new struct every time you derive Eq, so I am still not completely happy about it

jieyouxu · 2025-08-09T09:02:58Z

@rustbot author

jieyouxu · 2025-08-09T09:34:27Z

@bors r+ rollup

bors · 2025-08-09T09:34:29Z

📌 Commit 2d2a6f6 has been approved by jieyouxu

It is now in the queue for this repository.

Zalathar · 2025-08-09T13:04:24Z

This PR now has merge conflicts, but bors hasn't noticed yet.

@bors r-

some clauses can be merged together without requiring an attribute for each trait derived. also manually impl `Eq` because the `derive_where` generated code is too much for my comfort

fee1-dead · 2025-08-09T15:10:56Z

@bors r=jieyouxu

bors · 2025-08-09T15:10:59Z

📌 Commit 71f6e53 has been approved by jieyouxu

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - #144739 (Use new public libtest `ERROR_EXIT_CODE` constant in rustdoc) - #145089 (Improve error output when a command fails in bootstrap) - #145112 ([win][arm64ec] Partial fix for raw-dylib-link-ordinal on Arm64EC) - #145135 (Stabilize `duration_constructors_lite` feature) - #145146 (remove `P`) - #145152 (Use `to_ascii_lowercase` to avoid heap alloc in `detect_confuse_type`) - #145156 (Override custom Cargo `build-dir` in bootstrap) - #145160 (Change days-threshold to 28 in [behind-upstream]) Failed merges: - #145145 (some `derive_more` refactors) r? `@ghost` `@rustbot` modify labels: rollup

…r, r=jieyouxu some `derive_more` refactors some clauses can be merged together without requiring an attribute for each trait derived. also manually impl `Eq` because the `derive_where` generated code is too much for my comfort (cc ModProg/derive-where#128)

Rollup of 19 pull requests Successful merges: - #141624 (unstable-book: Add stubs for environment variables; document some of the important ones) - #143093 (Simplify polonius location-sensitive analysis) - #144402 (Stabilize loongarch32 inline asm) - #144403 (`tests/ui/issues/`: The Issues Strike Back [4/N]) - #144544 (Start reporting future breakage for `ILL_FORMED_ATTRIBUTE_INPUT` in dependencies) - #144739 (Use new public libtest `ERROR_EXIT_CODE` constant in rustdoc) - #145089 (Improve error output when a command fails in bootstrap) - #145112 ([win][arm64ec] Partial fix for raw-dylib-link-ordinal on Arm64EC) - #145129 ([win][arm64ec] Add `/machine:arm64ec` when linking LLVM as Arm64EC) - #145130 (improve "Documentation problem" issue template.) - #145135 (Stabilize `duration_constructors_lite` feature) - #145145 (some `derive_more` refactors) - #145147 (rename `TraitRef::from_method` to `from_assoc`) - #145156 (Override custom Cargo `build-dir` in bootstrap) - #145160 (Change days-threshold to 28 in [behind-upstream]) - #145162 (`{BTree,Hash}Map`: add "`Entry` API" section heading) - #145175 (Enable limit_rdylib_exports on Solaris) - #145187 (Fix an unstable feature comment that wasn't a doc comment) - #145191 (`suggest_borrow_generic_arg`: use the correct generic args) r? `@ghost` `@rustbot` modify labels: rollup

…r, r=jieyouxu some `derive_more` refactors some clauses can be merged together without requiring an attribute for each trait derived. also manually impl `Eq` because the `derive_where` generated code is too much for my comfort (cc ModProg/derive-where#128)

Rollup of 18 pull requests Successful merges: - #141624 (unstable-book: Add stubs for environment variables; document some of the important ones) - #143093 (Simplify polonius location-sensitive analysis) - #144402 (Stabilize loongarch32 inline asm) - #144403 (`tests/ui/issues/`: The Issues Strike Back [4/N]) - #144739 (Use new public libtest `ERROR_EXIT_CODE` constant in rustdoc) - #145089 (Improve error output when a command fails in bootstrap) - #145112 ([win][arm64ec] Partial fix for raw-dylib-link-ordinal on Arm64EC) - #145129 ([win][arm64ec] Add `/machine:arm64ec` when linking LLVM as Arm64EC) - #145130 (improve "Documentation problem" issue template.) - #145135 (Stabilize `duration_constructors_lite` feature) - #145145 (some `derive_more` refactors) - #145147 (rename `TraitRef::from_method` to `from_assoc`) - #145156 (Override custom Cargo `build-dir` in bootstrap) - #145160 (Change days-threshold to 28 in [behind-upstream]) - #145162 (`{BTree,Hash}Map`: add "`Entry` API" section heading) - #145175 (Enable limit_rdylib_exports on Solaris) - #145187 (Fix an unstable feature comment that wasn't a doc comment) - #145191 (`suggest_borrow_generic_arg`: use the correct generic args) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 17 pull requests Successful merges: - #141624 (unstable-book: Add stubs for environment variables; document some of the important ones) - #143093 (Simplify polonius location-sensitive analysis) - #144402 (Stabilize loongarch32 inline asm) - #144403 (`tests/ui/issues/`: The Issues Strike Back [4/N]) - #144739 (Use new public libtest `ERROR_EXIT_CODE` constant in rustdoc) - #145089 (Improve error output when a command fails in bootstrap) - #145112 ([win][arm64ec] Partial fix for raw-dylib-link-ordinal on Arm64EC) - #145129 ([win][arm64ec] Add `/machine:arm64ec` when linking LLVM as Arm64EC) - #145130 (improve "Documentation problem" issue template.) - #145135 (Stabilize `duration_constructors_lite` feature) - #145145 (some `derive_more` refactors) - #145147 (rename `TraitRef::from_method` to `from_assoc`) - #145156 (Override custom Cargo `build-dir` in bootstrap) - #145160 (Change days-threshold to 28 in [behind-upstream]) - #145162 (`{BTree,Hash}Map`: add "`Entry` API" section heading) - #145187 (Fix an unstable feature comment that wasn't a doc comment) - #145191 (`suggest_borrow_generic_arg`: use the correct generic args) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145145 - fee1-dead-contrib:push-qnmpmtmtpkkr, r=jieyouxu some `derive_more` refactors some clauses can be merged together without requiring an attribute for each trait derived. also manually impl `Eq` because the `derive_where` generated code is too much for my comfort (cc ModProg/derive-where#128)

rustbot assigned jieyouxu Aug 9, 2025

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 9, 2025

fee1-dead force-pushed the push-qnmpmtmtpkkr branch from 6451c6d to 2d2a6f6 Compare August 9, 2025 05:08

jieyouxu approved these changes Aug 9, 2025

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 9, 2025

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 Aug 9, 2025

Zalathar mentioned this pull request Aug 9, 2025

Rollup of 8 pull requests #145161

Closed

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 Aug 9, 2025

some derive_more refactors

71f6e53

some clauses can be merged together without requiring an attribute for each trait derived. also manually impl `Eq` because the `derive_where` generated code is too much for my comfort

fee1-dead force-pushed the push-qnmpmtmtpkkr branch from 2d2a6f6 to 71f6e53 Compare August 9, 2025 14:24

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 Aug 9, 2025

Zalathar mentioned this pull request Aug 10, 2025

Rollup of 21 pull requests #145192

Closed

Zalathar mentioned this pull request Aug 10, 2025

Rollup of 19 pull requests #145195

Closed

Zalathar mentioned this pull request Aug 10, 2025

Rollup of 19 pull requests #145197

Closed

Zalathar mentioned this pull request Aug 10, 2025

Rollup of 18 pull requests #145204

Closed

Zalathar mentioned this pull request Aug 10, 2025

Rollup of 17 pull requests #145210

Merged

bors merged commit b81be36 into rust-lang:master Aug 10, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

some `derive_more` refactors #145145

some `derive_more` refactors #145145

fee1-dead commented Aug 9, 2025

Uh oh!

rustbot commented Aug 9, 2025

Uh oh!

jieyouxu left a comment •

edited

Loading

Uh oh!

jieyouxu Aug 9, 2025

Uh oh!

fee1-dead Aug 9, 2025

Uh oh!

jieyouxu Aug 9, 2025

Uh oh!

lqd Aug 9, 2025

Uh oh!

fee1-dead Aug 9, 2025

Uh oh!

jieyouxu commented Aug 9, 2025

Uh oh!

jieyouxu commented Aug 9, 2025

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Zalathar commented Aug 9, 2025

Uh oh!

fee1-dead commented Aug 9, 2025

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Uh oh!

Uh oh!

some derive_more refactors #145145

some derive_more refactors #145145

Conversation

fee1-dead commented Aug 9, 2025

Uh oh!

rustbot commented Aug 9, 2025

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

lqd Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Aug 9, 2025

Uh oh!

jieyouxu commented Aug 9, 2025

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Zalathar commented Aug 9, 2025

Uh oh!

fee1-dead commented Aug 9, 2025

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Uh oh!

Uh oh!

some `derive_more` refactors #145145

some `derive_more` refactors #145145

jieyouxu left a comment •

edited

Loading