Skip to content

OutputTypeParameterMismatch -> SignatureMismatch - #119897

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:fulfillment-errors
Jan 15, 2024
Merged

bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:fulfillment-errors

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

I'm probably missing something that made this rename more complicated. What did you end up getting stuck on when renaming this selection error, @lcnr?

also I renamed the FulfillmentErrorCode variants. This is just churn but I wanted to do it forever. I can move it out of this PR if desired.

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 Jan 12, 2024
@rustbot

rustbot commented Jan 12, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

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

@lcnr

lcnr commented Jan 15, 2024 •

Copy link
Copy Markdown
Contributor

I'm probably missing something that made this rename more complicated. What did you end up getting stuck on when renaming this selection error, @lcnr?

because I ended up cleaning up more stuff, e.g. fn confirm_poly_trait_refs is a far too general name and its doc comment feels off to me.

@lcnr

lcnr commented Jan 15, 2024

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 15, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit fbdc116 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 Jan 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119818 (Silence some follow-up errors [3/x])
 - rust-lang#119870 (std: Doc blocking behavior of LazyLock)
 - rust-lang#119897 (`OutputTypeParameterMismatch` -> `SignatureMismatch`)
 - rust-lang#119963 (Fix `allow_internal_unstable` for `(min_)specialization`)
 - rust-lang#119971 (Use `zip_eq` to enforce that things being zipped have equal sizes)
 - rust-lang#119974 (Minor `trimmed_def_paths` improvements)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119818 (Silence some follow-up errors [3/x])
 - rust-lang#119870 (std: Doc blocking behavior of LazyLock)
 - rust-lang#119897 (`OutputTypeParameterMismatch` -> `SignatureMismatch`)
 - rust-lang#119963 (Fix `allow_internal_unstable` for `(min_)specialization`)
 - rust-lang#119971 (Use `zip_eq` to enforce that things being zipped have equal sizes)
 - rust-lang#119974 (Minor `trimmed_def_paths` improvements)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119818 (Silence some follow-up errors [3/x])
 - rust-lang#119870 (std: Doc blocking behavior of LazyLock)
 - rust-lang#119897 (`OutputTypeParameterMismatch` -> `SignatureMismatch`)
 - rust-lang#119963 (Fix `allow_internal_unstable` for `(min_)specialization`)
 - rust-lang#119971 (Use `zip_eq` to enforce that things being zipped have equal sizes)
 - rust-lang#119974 (Minor `trimmed_def_paths` improvements)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 1e46be6 into rust-lang:master Jan 15, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2024
Rollup merge of rust-lang#119897 - compiler-errors:fulfillment-errors, r=lcnr

`OutputTypeParameterMismatch` -> `SignatureMismatch`

I'm probably missing something that made this rename more complicated. What did you end up getting stuck on when renaming this selection error, `@lcnr?`

**also** I renamed the `FulfillmentErrorCode` variants. This is just churn but I wanted to do it forever. I can move it out of this PR if desired.

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.

4 participants