aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src/infer.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-04-03 12:09:43 +0100
committerGitHub <[email protected]>2021-04-03 12:09:43 +0100
commit2f87ee7f3f9c1efd726774511c9ce02caef73872 (patch)
treeaba0fc8a8b9dcd3456f47ae5cd28fa672a7a6911 /crates/hir_ty/src/infer.rs
parent8289b96216b5d4ddd0b6cf9feccb7af574d022a8 (diff)
parentc551604b5a0b74a43f5efe567bcbd979daa2f3cc (diff)
Merge #8310
8310: Rename Ty::interned to Ty::kind r=flodiebold a=flodiebold ... since that's the actual method on Chalk side that matches the signature. Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer.rs')
-rw-r--r--crates/hir_ty/src/infer.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs
index 674e9e6f9..b871594bd 100644
--- a/crates/hir_ty/src/infer.rs
+++ b/crates/hir_ty/src/infer.rs
@@ -325,7 +325,7 @@ impl<'a> InferenceContext<'a> {
325 325
326 /// Replaces Ty::Unknown by a new type var, so we can maybe still infer it. 326 /// Replaces Ty::Unknown by a new type var, so we can maybe still infer it.
327 fn insert_type_vars_shallow(&mut self, ty: Ty) -> Ty { 327 fn insert_type_vars_shallow(&mut self, ty: Ty) -> Ty {
328 match ty.interned(&Interner) { 328 match ty.kind(&Interner) {
329 TyKind::Unknown => self.table.new_type_var(), 329 TyKind::Unknown => self.table.new_type_var(),
330 _ => ty, 330 _ => ty,
331 } 331 }
@@ -438,7 +438,7 @@ impl<'a> InferenceContext<'a> {
438 /// to do it as well. 438 /// to do it as well.
439 fn normalize_associated_types_in(&mut self, ty: Ty) -> Ty { 439 fn normalize_associated_types_in(&mut self, ty: Ty) -> Ty {
440 let ty = self.resolve_ty_as_possible(ty); 440 let ty = self.resolve_ty_as_possible(ty);
441 ty.fold(&mut |ty| match ty.interned(&Interner) { 441 ty.fold(&mut |ty| match ty.kind(&Interner) {
442 TyKind::Alias(AliasTy::Projection(proj_ty)) => { 442 TyKind::Alias(AliasTy::Projection(proj_ty)) => {
443 self.normalize_projection_ty(proj_ty.clone()) 443 self.normalize_projection_ty(proj_ty.clone())
444 } 444 }