From 3411fe3e84e641aad03abbc22eec33fdc29b15f8 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 14 Mar 2021 16:26:12 +0100 Subject: Rename some fields to their Chalk names --- crates/hir_ty/src/lower.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/hir_ty/src/lower.rs') diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index c32dca9d7..17eb29911 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs @@ -357,8 +357,8 @@ impl<'a> TyLoweringContext<'a> { Some((super_trait_ref, associated_ty)) => { // FIXME handle type parameters on the segment TyKind::Alias(AliasTy::Projection(ProjectionTy { - associated_ty: to_assoc_type_id(associated_ty), - parameters: super_trait_ref.substs, + associated_ty_id: to_assoc_type_id(associated_ty), + substitution: super_trait_ref.substs, })) .intern(&Interner) } @@ -478,8 +478,8 @@ impl<'a> TyLoweringContext<'a> { // FIXME handle type parameters on the segment return Some( TyKind::Alias(AliasTy::Projection(ProjectionTy { - associated_ty: to_assoc_type_id(associated_ty), - parameters: substs, + associated_ty_id: to_assoc_type_id(associated_ty), + substitution: substs, })) .intern(&Interner), ); @@ -736,8 +736,8 @@ impl<'a> TyLoweringContext<'a> { Some(t) => t, }; let projection_ty = ProjectionTy { - associated_ty: to_assoc_type_id(associated_ty), - parameters: super_trait_ref.substs, + associated_ty_id: to_assoc_type_id(associated_ty), + substitution: super_trait_ref.substs, }; let mut preds = SmallVec::with_capacity( binding.type_ref.as_ref().map_or(0, |_| 1) + binding.bounds.len(), -- cgit v1.2.3 From eea777c7148ac6c52434e8ea4913cdb50a466a3e Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 14 Mar 2021 16:30:02 +0100 Subject: Use chalk_ir::FnSig --- crates/hir_ty/src/lower.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/hir_ty/src/lower.rs') diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 17eb29911..76b2124af 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs @@ -8,7 +8,7 @@ use std::{iter, sync::Arc}; use base_db::CrateId; -use chalk_ir::{cast::Cast, Mutability}; +use chalk_ir::{cast::Cast, Mutability, Safety}; use hir_def::{ adt::StructKind, builtin_type::BuiltinType, @@ -181,7 +181,7 @@ impl<'a> TyLoweringContext<'a> { let substs = Substs(params.iter().map(|tr| self.lower_ty(tr)).collect()); TyKind::Function(FnPointer { num_args: substs.len() - 1, - sig: FnSig { variadic: *is_varargs }, + sig: FnSig { abi: (), safety: Safety::Safe, variadic: *is_varargs }, substs, }) .intern(&Interner) -- cgit v1.2.3 From 195414783402d6973f4e673e84be9b7bc19cbfa6 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 14 Mar 2021 16:33:27 +0100 Subject: More renaming --- crates/hir_ty/src/lower.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'crates/hir_ty/src/lower.rs') diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 76b2124af..d026310f4 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs @@ -230,8 +230,11 @@ impl<'a> TyLoweringContext<'a> { let opaque_ty_id = self.db.intern_impl_trait_id(impl_trait_id).into(); let generics = generics(self.db.upcast(), func.into()); let parameters = Substs::bound_vars(&generics, self.in_binders); - TyKind::Alias(AliasTy::Opaque(OpaqueTy { opaque_ty_id, parameters })) - .intern(&Interner) + TyKind::Alias(AliasTy::Opaque(OpaqueTy { + opaque_ty_id, + substitution: parameters, + })) + .intern(&Interner) } ImplTraitLoweringMode::Param => { let idx = self.impl_trait_counter.get(); -- cgit v1.2.3