bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #106389 - compiler-errors:no-canonicalized, r=lcnr

Browse source 
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.
This commit is contained in:
fee1-dead 2023-01-09 23:35:30 +08:00 • committed by GitHub
commit f8319bb403
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 52 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_middle/src/infer/canonical.rs
View file

@ -213,9 +213,7 @@ impl QueryRegionConstraints<'_> {
}
}
pub type Canonicalized<'tcx, V> = Canonical<'tcx, V>;
pub type CanonicalizedQueryResponse<'tcx, T> = &'tcx Canonical<'tcx, QueryResponse<'tcx, T>>;
pub type CanonicalQueryResponse<'tcx, T> = &'tcx Canonical<'tcx, QueryResponse<'tcx, T>>;
/// Indicates whether or not we were able to prove the query to be
/// true.

2
compiler/rustc_middle/src/ty/typeck_results.rs
View file

@ -626,7 +626,7 @@ pub struct CanonicalUserTypeAnnotation<'tcx> {
pub inferred_ty: Ty<'tcx>,
}
/// Canonicalized user type annotation.
/// Canonical user type annotation.
pub type CanonicalUserType<'tcx> = Canonical<'tcx, UserType<'tcx>>;
impl<'tcx> CanonicalUserType<'tcx> {