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.

Sign up for GitHub

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

Jump to bottom

Use Binder<Vec<Ty>> instead of Vec<Binder<Ty>> in both solvers for sized/auto traits/etc. #137689

Merged
merged 2 commits into from
Mar 1, 2025
Merged

Use Binder<Vec<Ty>> instead of Vec<Binder<Ty>> in both solvers for sized/auto traits/etc. #137689

merged 2 commits into from
Mar 1, 2025

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Feb 26, 2025 •
edited
Loading

It's more conceptually justified IMO, especially when binders get implications.

r? lcnr

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Feb 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 26, 2025

changes to the core type system

cc @compiler-errors, @lcnr

lcnr
lcnr reviewed Feb 27, 2025
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with or without nit

compiler/rustc_infer/src/infer/relate/higher_ranked.rs
Comment on lines +31 to +32
if !binder.as_ref().skip_binder().has_escaping_bound_vars() {
return binder.skip_binder();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to avoid clone?

do we do this more often, I've encountered this myself and have considered try_no_bound_vars() -> Result<T, Binder<T>> or maybe just changing no_bound_vars to that

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well now in this pr we're entering whole binders of vecs rather than iterating over a vec of binder of ty which we then enter, so we do this more often i think

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"do we do this more often"

as in: the pattern of no_bound_vars() and doing something with the binder if it returns None.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohhh, as far as i can tell, no this seems like the only place where we were previously repeatedly fighting the Copy bound bc no_bound_vars consumes its valur

@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup

@bors
Copy link
Contributor

bors commented Feb 27, 2025

📌 Commit ad74788 has been approved by lcnr

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 27, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Feb 27, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 28, 2025
@matthiaskrgr
Rollup merge of rust-lang#137689 - compiler-errors:coroutine, r=lcnr
2dd51d1 
Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.

It's more conceptually justified IMO, especially when binders get implications.

r? lcnr
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 28, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2025
@bors
Auto merge of rust-lang#137775 - matthiaskrgr:rollup-05i9urn, r=matth…
0564a51 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking)
 - rust-lang#137171 (Suggest swapping equality on E0277)
 - rust-lang#137634 (Update `compiler-builtins` to 0.1.149)
 - rust-lang#137686 (Handle asm const similar to inline const)
 - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.)
 - rust-lang#137718 (Use original command for showing sccache stats)
 - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`)
 - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision)
 - rust-lang#137735 (Update E0133 docs for 2024 edition)
 - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match)
 - rust-lang#137771 (Tweak incorrect ABI suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2025
@bors
Auto merge of rust-lang#137775 - matthiaskrgr:rollup-05i9urn, r=matth…
7726686 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking)
 - rust-lang#137171 (Suggest swapping equality on E0277)
 - rust-lang#137634 (Update `compiler-builtins` to 0.1.149)
 - rust-lang#137686 (Handle asm const similar to inline const)
 - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.)
 - rust-lang#137718 (Use original command for showing sccache stats)
 - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`)
 - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision)
 - rust-lang#137735 (Update E0133 docs for 2024 edition)
 - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match)
 - rust-lang#137771 (Tweak incorrect ABI suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2025
@bors
Auto merge of rust-lang#137775 - matthiaskrgr:rollup-05i9urn, r=matth…
849febc 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking)
 - rust-lang#137171 (Suggest swapping equality on E0277)
 - rust-lang#137634 (Update `compiler-builtins` to 0.1.149)
 - rust-lang#137686 (Handle asm const similar to inline const)
 - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.)
 - rust-lang#137718 (Use original command for showing sccache stats)
 - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`)
 - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision)
 - rust-lang#137735 (Update E0133 docs for 2024 edition)
 - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match)
 - rust-lang#137771 (Tweak incorrect ABI suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 28, 2025
@matthiaskrgr
Rollup merge of rust-lang#137689 - compiler-errors:coroutine, r=lcnr
ae57555 
Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.

It's more conceptually justified IMO, especially when binders get implications.

r? lcnr
This was referenced Feb 28, 2025
Open
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@bors
Auto merge of rust-lang#137838 - matthiaskrgr:rollup-5brlcyr, r=matth…
002da76 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking)
 - rust-lang#137171 (Suggest swapping equality on E0277)
 - rust-lang#137686 (Handle asm const similar to inline const)
 - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.)
 - rust-lang#137718 (Use original command for showing sccache stats)
 - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision)
 - rust-lang#137735 (Update E0133 docs for 2024 edition)
 - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match)
 - rust-lang#137771 (Tweak incorrect ABI suggestion and make suggestion verbose)

Failed merges:

 - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3cd89f2 into rust-lang:master Mar 1, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 1, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@rust-timer
Unrolled build for rust-lang#137689
9d5f369 
Rollup merge of rust-lang#137689 - compiler-errors:coroutine, r=lcnr

Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.

It's more conceptually justified IMO, especially when binders get implications.

r? lcnr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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)
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
4 participants
@compiler-errors @rustbot @bors @lcnr