Skip to content

Simplify some canonical type alias names - #106389

Merged
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:no-canonicalized
Jan 9, 2023
Merged

Simplify some canonical type alias names#106389
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:no-canonicalized

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor
  • delete the Canonicalized<'tcx> type alias in favor for Canonical<'tcx>
  • CanonicalizedQueryResponse -> CanonicalQueryResponse

I don't particularly care about the latter, but it should be consistent. We could alternatively delete the first alias and rename the struct to Canonicalized, and then keep the name of CanonicalizedQueryResponse untouched.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @oli-obk

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

@rustbotrustbot 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 Jan 3, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr

@lcnr

lcnr commented Jan 9, 2023

Copy link
Copy Markdown
Contributor

r? @lcnr

@bors r+ rollup

@bors

bors commented Jan 9, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 50ab306 has been approved by lcnr

It is now in the queue for this repository.

@rustbotrustbot assigned lcnr and unassigned oli-obkJan 9, 2023
@borsbors 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 9, 2023
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 9, 2023
…r=lcnr
Simplify some canonical type alias names
* delete the `Canonicalized<'tcx>` type alias in favor for `Canonical<'tcx>`
* `CanonicalizedQueryResponse` -> `CanonicalQueryResponse`
I don't particularly care about the latter, but it should be consistent. We could alternatively delete the first alias and rename the struct to `Canonicalized`, and then keep the name of `CanonicalizedQueryResponse` untouched.
@JohnTitorJohnTitor mentioned this pull request Jan 9, 2023
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 9, 2023
…r=lcnr
Simplify some canonical type alias names
* delete the `Canonicalized<'tcx>` type alias in favor for `Canonical<'tcx>`
* `CanonicalizedQueryResponse` -> `CanonicalQueryResponse`
I don't particularly care about the latter, but it should be consistent. We could alternatively delete the first alias and rename the struct to `Canonicalized`, and then keep the name of `CanonicalizedQueryResponse` untouched.
@JohnTitorJohnTitor mentioned this pull request Jan 9, 2023
@fee1-deadfee1-dead mentioned this pull request Jan 9, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2023
…fee1-dead
Rollup of 10 pull requests
Successful merges:
- rust-lang#105292 (Change a commit_if_ok call to probe)
- rust-lang#105655 (Remove invalid case for mutable borrow suggestion)
- rust-lang#106047 (Fix ui constant tests for big-endian platforms)
- rust-lang#106061 (Enable Shadow Call Stack for Fuchsia on AArch64)
- rust-lang#106164 (Move `check_region_obligations_and_report_errors` to `TypeErrCtxt`)
- rust-lang#106291 (Fix incorrect suggestion for extra `&` in pattern)
- rust-lang#106389 (Simplify some canonical type alias names)
- rust-lang#106468 (Use FxIndexSet when updating obligation causes in `adjust_fulfillment_errors_for_expr_obligation`)
- rust-lang#106549 (Use fmt named parameters in rustc_borrowck)
- rust-lang#106614 (error-code docs improvements (No. 2))
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit f8319bb into rust-lang:masterJan 9, 2023
@rustbotrustbot added this to the 1.68.0 milestone Jan 9, 2023
@compiler-errors
compiler-errors deleted the no-canonicalized branch August 11, 2023 20:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@compiler-errors@rustbot@lcnr@bors@oli-obk