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

Remove special-casing for SimplifiedType for next solver #124379

Merged

Conversation

compiler-errors
Copy link
Member

It's unnecessary due to the way that we fully normalize the self type before assembly begins.

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 Apr 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2024

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@rust-log-analyzer

This comment has been minimized.

Comment on lines -166 to -167
// Note that we're using `TreatParams::ForLookup` to query `non_blanket_impls` while using
// `TreatParams::AsCandidateKey` while actually adding them.
Copy link
Contributor

Choose a reason for hiding this comment

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

these two lines are still important

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 after nit

@compiler-errors compiler-errors force-pushed the remove-new-solver-lookup-behavior branch from 1555214 to f2518cd Compare April 25, 2024 18:27
@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2024

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Apr 25, 2024

📌 Commit f2518cd has been approved by lcnr

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 Apr 25, 2024
@bors
Copy link
Contributor

bors commented Apr 25, 2024

⌛ Testing commit f2518cd with merge 6e41671...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2024
…okup-behavior, r=lcnr

Remove special-casing for `SimplifiedType` for next solver

It's unnecessary due to the way that we fully normalize the self type before assembly begins.

r? lcnr
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] rustc_incremental test:false 38.693
[RUSTC-TIMING] rustc_transmute test:false 19.743
[RUSTC-TIMING] rustc_mir_dataflow test:false 43.766
[RUSTC-TIMING] rustc_smir test:false 46.610
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

@bors
Copy link
Contributor

bors commented Apr 26, 2024

💔 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 Apr 26, 2024
@compiler-errors
Copy link
Member Author

@bors retry

@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 Apr 26, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2024
…mpiler-errors

Rollup of 4 pull requests

Successful merges:

 - rust-lang#124076 (Stablise io_error_downcast)
 - rust-lang#124378 (Keep the LIB env var in the compiler-builtins test)
 - rust-lang#124379 (Remove special-casing for `SimplifiedType` for next solver)
 - rust-lang#124381 (Renamed `DerivedObligation` to `WellFormedDeriveObligation`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4494140 into rust-lang:master Apr 26, 2024
10 of 11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2024
Rollup merge of rust-lang#124379 - compiler-errors:remove-new-solver-lookup-behavior, r=lcnr

Remove special-casing for `SimplifiedType` for next solver

It's unnecessary due to the way that we fully normalize the self type before assembly begins.

r? lcnr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants