Rename TyKind::ForeignType to Foreign

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 76d0e98af8d706b989bfcca999e11671c0233c02..b14c9a67509c04cfdc252918d68f8cf69e0fbc05 100644 (file)
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -1900,7 +1900,7 @@ fn go(ty: &Ty) -> bool {
                 | TyKind::Dyn(_)
                 | TyKind::Function(_)
                 | TyKind::Alias(_)
-                | TyKind::ForeignType(_) => false,
+                | TyKind::Foreign(_) => false,
             }
         }
     }

diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 83d09a8c794e7ccc09a6965043483844af6fa4c1..5ff70c893a2328542c4768124b502659484b34f1 100644 (file)
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -529,7 +529,7 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
                     projection_ty.hir_fmt(f)?;
                 }
             }
-            TyKind::ForeignType(type_alias) => {
+            TyKind::Foreign(type_alias) => {
                 let type_alias = f.db.type_alias_data(from_foreign_def_id(*type_alias));
                 write!(f, "{}", type_alias.name)?;
             }

diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs
index 9e030e7753a6b5da2f07c54403b638838ca7bd57..d1513df1f95b2fd104800094616d891c6ff9178b 100644 (file)
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir_ty/src/lib.rs
@@ -290,7 +290,7 @@ pub fn as_generic_def(&self, db: &dyn HirDatabase) -> Option<GenericDefId> {
                 Some(db.lookup_intern_callable_def(callable.into()).into())
             }
             TyKind::AssociatedType(type_alias, ..) => Some(from_assoc_type_id(type_alias).into()),
-            TyKind::ForeignType(type_alias, ..) => Some(from_foreign_def_id(type_alias).into()),
+            TyKind::Foreign(type_alias, ..) => Some(from_foreign_def_id(type_alias).into()),
             _ => None,
         }
     }
@@ -312,7 +312,7 @@ pub fn equals_ctor(&self, other: &Ty) -> bool {
             (TyKind::AssociatedType(ty_id, ..), TyKind::AssociatedType(ty_id2, ..)) => {
                 ty_id == ty_id2
             }
-            (TyKind::ForeignType(ty_id, ..), TyKind::ForeignType(ty_id2, ..)) => ty_id == ty_id2,
+            (TyKind::Foreign(ty_id, ..), TyKind::Foreign(ty_id2, ..)) => ty_id == ty_id2,
             (TyKind::Closure(id1, _), TyKind::Closure(id2, _)) => id1 == id2,
             (TyKind::Ref(mutability, ..), TyKind::Ref(mutability2, ..))
             | (TyKind::Raw(mutability, ..), TyKind::Raw(mutability2, ..)) => {

diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs
index dd40eb5c33e1a1d0716f5ed60339979bf22c44dc..ba48be4ad0f1daa924e448898a3b8b9d6b3127ba 100644 (file)
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir_ty/src/lower.rs
@@ -1145,7 +1145,7 @@ fn type_for_type_alias(db: &dyn HirDatabase, t: TypeAliasId) -> Binders<Ty> {
     let ctx =
         TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
     if db.type_alias_data(t).is_extern {
-        Binders::new(0, TyKind::ForeignType(crate::to_foreign_def_id(t)).intern(&Interner))
+        Binders::new(0, TyKind::Foreign(crate::to_foreign_def_id(t)).intern(&Interner))
     } else {
         let type_ref = &db.type_alias_data(t).type_ref;
         let inner = ctx.lower_ty(type_ref.as_deref().unwrap_or(&TypeRef::Error));

diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
index dc6324780ec57c08131af85abc8f35aa0ac2502b..6ace970d1c1867ec355df0bde76670f1b592633a 100644 (file)
--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir_ty/src/method_resolution.rs
@@ -55,7 +55,7 @@ pub fn for_impl(ty: &Ty) -> Option<TyFingerprint> {
             TyKind::Adt(AdtId(adt), _) => TyFingerprint::Adt(adt),
             TyKind::Tuple(cardinality, _) => TyFingerprint::Tuple(cardinality),
             TyKind::Raw(mutability, ..) => TyFingerprint::RawPtr(mutability),
-            TyKind::ForeignType(alias_id, ..) => TyFingerprint::ForeignType(alias_id),
+            TyKind::Foreign(alias_id, ..) => TyFingerprint::ForeignType(alias_id),
             TyKind::Function(FnPointer { num_args, sig, .. }) => {
                 TyFingerprint::FnPtr(num_args, sig)
             }
@@ -246,7 +246,7 @@ macro_rules! lang_item_crate {
             TyKind::Adt(AdtId(def_id), _) => {
                 return mod_to_crate_ids(def_id.module(db.upcast()));
             }
-            TyKind::ForeignType(id) => {
+            TyKind::Foreign(id) => {
                 return mod_to_crate_ids(
                     from_foreign_def_id(*id).lookup(db.upcast()).module(db.upcast()),
                 );

diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs
index c5654f17b7586e33cad233bf418bceb330968f2b..59aaa5560408620883ecbf6e01e2c4b84b83a85c 100644 (file)
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -43,7 +43,7 @@ fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Ty<Interner> {
                 chalk_ir::TyKind::OpaqueType(id, substitution).intern(&Interner)
             }
 
-            TyKind::ForeignType(id) => chalk_ir::TyKind::Foreign(id).intern(&Interner),
+            TyKind::Foreign(id) => chalk_ir::TyKind::Foreign(id).intern(&Interner),
 
             TyKind::Scalar(scalar) => chalk_ir::TyKind::Scalar(scalar).intern(&Interner),
 
@@ -181,7 +181,7 @@ fn from_chalk(db: &dyn HirDatabase, chalk: chalk_ir::Ty<Interner>) -> Self {
 
             chalk_ir::TyKind::Closure(id, subst) => TyKind::Closure(id, from_chalk(db, subst)),
 
-            chalk_ir::TyKind::Foreign(foreign_def_id) => TyKind::ForeignType(foreign_def_id),
+            chalk_ir::TyKind::Foreign(foreign_def_id) => TyKind::Foreign(foreign_def_id),
             chalk_ir::TyKind::Generator(_, _) => unimplemented!(), // FIXME
             chalk_ir::TyKind::GeneratorWitness(_, _) => unimplemented!(), // FIXME
         }

diff --git a/crates/hir_ty/src/types.rs b/crates/hir_ty/src/types.rs
index 9853ab3beaa136ffc1c27c6ba210e534fbd9a3ed..bac086318f244ea7a5d538af331d0d411eb7fcbd 100644 (file)
--- a/crates/hir_ty/src/types.rs
+++ b/crates/hir_ty/src/types.rs
@@ -132,7 +132,7 @@ pub enum TyKind {
     Closure(ClosureId, Substitution),
 
     /// Represents a foreign type declared in external blocks.
-    ForeignType(ForeignDefId),
+    Foreign(ForeignDefId),
 
     /// A pointer to a function.  Written as `fn() -> i32`.
     ///