From 407196b8c0f23e3ddc26e789b84542b1fd9b0eb8 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Sun, 28 Feb 2021 22:12:07 +0100
Subject: Lift FnPointer into a struct

---
 crates/hir_ty/src/method_resolution.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'crates/hir_ty/src/method_resolution.rs')

diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
index ff8ce5599..c8a0ad5f1 100644
--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir_ty/src/method_resolution.rs
@@ -18,8 +18,8 @@ use crate::{
     db::HirDatabase,
     primitive::{self, FloatTy, IntTy, UintTy},
     utils::all_super_traits,
-    Canonical, DebruijnIndex, InEnvironment, Scalar, Substs, TraitEnvironment, TraitRef, Ty,
-    TyKind, TypeWalk,
+    Canonical, DebruijnIndex, FnPointer, FnSig, InEnvironment, Scalar, Substs, TraitEnvironment,
+    TraitRef, Ty, TyKind, TypeWalk,
 };
 
 /// This is used as a key for indexing impls.
@@ -35,7 +35,7 @@ pub enum TyFingerprint {
     Dyn(TraitId),
     Tuple(usize),
     ForeignType(TypeAliasId),
-    FnPtr { num_args: u16, is_varargs: bool },
+    FnPtr(usize, FnSig),
 }
 
 impl TyFingerprint {
@@ -53,9 +53,7 @@ impl TyFingerprint {
             &Ty::Tuple(cardinality, _) => TyFingerprint::Tuple(cardinality),
             &Ty::RawPtr(mutability, ..) => TyFingerprint::RawPtr(mutability),
             &Ty::ForeignType(alias_id, ..) => TyFingerprint::ForeignType(alias_id),
-            &Ty::FnPtr { num_args, is_varargs, .. } => {
-                TyFingerprint::FnPtr { num_args, is_varargs }
-            }
+            &Ty::Function(FnPointer { num_args, sig, .. }) => TyFingerprint::FnPtr(num_args, sig),
             Ty::Dyn(_) => ty.dyn_trait().map(|trait_| TyFingerprint::Dyn(trait_))?,
             _ => return None,
         };
-- 
cgit v1.2.3