language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use chalk_ir::FnDefId

Browse source
This commit is contained in:
Florian Diebold 2021-03-13 17:55:50 +01:00
parent 19664e276a
commit 9719ce9fc7
10 changed files with 48 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/hir_ty/src/infer/expr.rs
View file

@ -19,7 +19,7 @@ use crate::{
method_resolution, op,
primitive::{self, UintTy},
to_assoc_type_id,
traits::{FnTrait, InEnvironment},
traits::{chalk::from_chalk, FnTrait, InEnvironment},
utils::{generics, variant_data, Generics},
AdtId, Binders, CallableDefId, FnPointer, FnSig, Interner, Obligation, OpaqueTyId, Rawness,
Scalar, Substs, TraitRef, Ty, TyKind,
@ -932,8 +932,9 @@ impl<'a> InferenceContext<'a> {
}
fn register_obligations_for_call(&mut self, callable_ty: &Ty) {
if let TyKind::FnDef(def, parameters) = callable_ty.interned(&Interner) {
let generic_predicates = self.db.generic_predicates((*def).into());
if let TyKind::FnDef(fn_def, parameters) = callable_ty.interned(&Interner) {
let def: CallableDefId = from_chalk(self.db, *fn_def);
let generic_predicates = self.db.generic_predicates(def.into());
for predicate in generic_predicates.iter() {
let predicate = predicate.clone().subst(parameters);
if let Some(obligation) = Obligation::from_predicate(predicate) {