From 3f94a90c7bbc1b3116a7960ae9f25ebe35d68ad0 Mon Sep 17 00:00:00 2001 From: adamrk Date: Sun, 7 Jun 2020 21:57:29 +0200 Subject: Infer FnSig from Fn traits --- crates/ra_hir_ty/src/infer/coerce.rs | 6 +-- crates/ra_hir_ty/src/infer/expr.rs | 102 ++++++++++++++++++++++++++++++----- 2 files changed, 92 insertions(+), 16 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/coerce.rs b/crates/ra_hir_ty/src/infer/coerce.rs index 32c7c57cd..4c5f171de 100644 --- a/crates/ra_hir_ty/src/infer/coerce.rs +++ b/crates/ra_hir_ty/src/infer/coerce.rs @@ -38,8 +38,8 @@ impl<'a> InferenceContext<'a> { // Special case: two function types. Try to coerce both to // pointers to have a chance at getting a match. See // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916 - let sig1 = ty1.callable_sig(self.db).expect("FnDef without callable sig"); - let sig2 = ty2.callable_sig(self.db).expect("FnDef without callable sig"); + let sig1 = self.callable_sig(ty1).expect("FnDef without callable sig"); + let sig2 = self.callable_sig(ty2).expect("FnDef without callable sig"); let ptr_ty1 = Ty::fn_ptr(sig1); let ptr_ty2 = Ty::fn_ptr(sig2); self.coerce_merge_branch(&ptr_ty1, &ptr_ty2) @@ -93,7 +93,7 @@ impl<'a> InferenceContext<'a> { // `{function_type}` -> `fn()` (ty_app!(TypeCtor::FnDef(_)), ty_app!(TypeCtor::FnPtr { .. })) => { - match from_ty.callable_sig(self.db) { + match self.callable_sig(&from_ty) { None => return false, Some(sig) => { from_ty = Ty::fn_ptr(sig); diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 9fd310f69..bba6daeb9 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -15,15 +15,15 @@ use ra_syntax::ast::RangeOp; use crate::{ autoderef, method_resolution, op, - traits::InEnvironment, + traits::{builtin::get_fn_trait, FnTrait, InEnvironment, SolutionVariables}, utils::{generics, variant_data, Generics}, - ApplicationTy, Binders, CallableDef, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, - TraitRef, Ty, TypeCtor, + ApplicationTy, Binders, CallableDef, FnSig, InferTy, IntTy, Mutability, Obligation, Rawness, + Substs, TraitRef, Ty, TypeCtor, }; use super::{ find_breakable, BindingMode, BreakableContext, Diverges, Expectation, InferenceContext, - InferenceDiagnostic, TypeMismatch, + InferenceDiagnostic, Solution, TypeMismatch, }; impl<'a> InferenceContext<'a> { @@ -63,6 +63,75 @@ impl<'a> InferenceContext<'a> { self.resolve_ty_as_possible(ty) } + fn callable_sig_from_fn_trait(&mut self, ty: &Ty) -> Option { + if let Some(krate) = self.resolver.krate() { + let fn_traits: Vec = [FnTrait::FnOnce, FnTrait::FnMut, FnTrait::Fn] + .iter() + .filter_map(|f| get_fn_trait(self.db, krate, *f)) + .collect(); + for fn_trait in fn_traits { + let fn_trait_data = self.db.trait_data(fn_trait); + let generic_params = generics(self.db.upcast(), fn_trait.into()); + if generic_params.len() != 2 { + continue; + } + + let arg_ty = self.table.new_type_var(); + let substs = Substs::build_for_generics(&generic_params) + .push(ty.clone()) + .push(arg_ty.clone()) + .build(); + + let trait_ref = TraitRef { trait_: fn_trait, substs: substs.clone() }; + let trait_env = Arc::clone(&self.trait_env); + let implements_fn_goal = + self.canonicalizer().canonicalize_obligation(InEnvironment { + value: Obligation::Trait(trait_ref), + environment: trait_env, + }); + if let Some(Solution::Unique(SolutionVariables(solution))) = + self.db.trait_solve(krate, implements_fn_goal.value.clone()) + { + match solution.value.as_slice() { + [Ty::Apply(ApplicationTy { + ctor: TypeCtor::Tuple { cardinality: _ }, + parameters, + })] => { + let output_assoc_type = match fn_trait_data + .associated_types() + .collect::>() + .as_slice() + { + [output] => *output, + _ => { + continue; + } + }; + let output_proj_ty = crate::ProjectionTy { + associated_ty: output_assoc_type, + parameters: substs, + }; + let return_ty = self.normalize_projection_ty(output_proj_ty); + return Some(FnSig::from_params_and_return( + parameters.into_iter().map(|ty| ty.clone()).collect(), + return_ty, + )); + } + _ => (), + } + } + } + }; + None + } + + pub fn callable_sig(&mut self, ty: &Ty) -> Option { + match ty.callable_sig(self.db) { + result @ Some(_) => result, + None => self.callable_sig_from_fn_trait(ty), + } + } + fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty { let body = Arc::clone(&self.body); // avoid borrow checker problem let ty = match &body[tgt_expr] { @@ -198,14 +267,21 @@ impl<'a> InferenceContext<'a> { } Expr::Call { callee, args } => { let callee_ty = self.infer_expr(*callee, &Expectation::none()); - let (param_tys, ret_ty) = match callee_ty.callable_sig(self.db) { - Some(sig) => (sig.params().to_vec(), sig.ret().clone()), - None => { - // Not callable - // FIXME: report an error - (Vec::new(), Ty::Unknown) - } - }; + let canonicalized = self.canonicalizer().canonicalize_ty(callee_ty.clone()); + let mut derefs = autoderef( + self.db, + self.resolver.krate(), + InEnvironment { + value: canonicalized.value.clone(), + environment: self.trait_env.clone(), + }, + ); + let (param_tys, ret_ty): (Vec, Ty) = derefs + .find_map(|callee_deref_ty| { + self.callable_sig(&canonicalized.decanonicalize_ty(callee_deref_ty.value)) + .map(|sig| (sig.params().to_vec(), sig.ret().clone())) + }) + .unwrap_or((Vec::new(), Ty::Unknown)); self.register_obligations_for_call(&callee_ty); self.check_call_arguments(args, ¶m_tys); self.normalize_associated_types_in(ret_ty) @@ -692,7 +768,7 @@ impl<'a> InferenceContext<'a> { let method_ty = method_ty.subst(&substs); let method_ty = self.insert_type_vars(method_ty); self.register_obligations_for_call(&method_ty); - let (expected_receiver_ty, param_tys, ret_ty) = match method_ty.callable_sig(self.db) { + let (expected_receiver_ty, param_tys, ret_ty) = match self.callable_sig(&method_ty) { Some(sig) => { if !sig.params().is_empty() { (sig.params()[0].clone(), sig.params()[1..].to_vec(), sig.ret().clone()) -- cgit v1.2.3 From cf870af8073e3a72fdfb1d36b017f0abd7593559 Mon Sep 17 00:00:00 2001 From: adamrk Date: Sat, 20 Jun 2020 08:13:14 +0200 Subject: Switch back callable_sig for known fn types --- crates/ra_hir_ty/src/infer/coerce.rs | 6 +++--- crates/ra_hir_ty/src/infer/expr.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/coerce.rs b/crates/ra_hir_ty/src/infer/coerce.rs index 4c5f171de..32c7c57cd 100644 --- a/crates/ra_hir_ty/src/infer/coerce.rs +++ b/crates/ra_hir_ty/src/infer/coerce.rs @@ -38,8 +38,8 @@ impl<'a> InferenceContext<'a> { // Special case: two function types. Try to coerce both to // pointers to have a chance at getting a match. See // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916 - let sig1 = self.callable_sig(ty1).expect("FnDef without callable sig"); - let sig2 = self.callable_sig(ty2).expect("FnDef without callable sig"); + let sig1 = ty1.callable_sig(self.db).expect("FnDef without callable sig"); + let sig2 = ty2.callable_sig(self.db).expect("FnDef without callable sig"); let ptr_ty1 = Ty::fn_ptr(sig1); let ptr_ty2 = Ty::fn_ptr(sig2); self.coerce_merge_branch(&ptr_ty1, &ptr_ty2) @@ -93,7 +93,7 @@ impl<'a> InferenceContext<'a> { // `{function_type}` -> `fn()` (ty_app!(TypeCtor::FnDef(_)), ty_app!(TypeCtor::FnPtr { .. })) => { - match self.callable_sig(&from_ty) { + match from_ty.callable_sig(self.db) { None => return false, Some(sig) => { from_ty = Ty::fn_ptr(sig); diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index bba6daeb9..a23d8abd6 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -768,7 +768,7 @@ impl<'a> InferenceContext<'a> { let method_ty = method_ty.subst(&substs); let method_ty = self.insert_type_vars(method_ty); self.register_obligations_for_call(&method_ty); - let (expected_receiver_ty, param_tys, ret_ty) = match self.callable_sig(&method_ty) { + let (expected_receiver_ty, param_tys, ret_ty) = match method_ty.callable_sig(self.db) { Some(sig) => { if !sig.params().is_empty() { (sig.params()[0].clone(), sig.params()[1..].to_vec(), sig.ret().clone()) -- cgit v1.2.3 From 38f6cdbc8a83b081ad1cef9171e28431be09db01 Mon Sep 17 00:00:00 2001 From: adamrk Date: Sat, 20 Jun 2020 08:42:35 +0200 Subject: Make get_fn_trait a method of FnTrait --- crates/ra_hir_ty/src/infer/expr.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index a23d8abd6..8c924ad42 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -15,7 +15,7 @@ use ra_syntax::ast::RangeOp; use crate::{ autoderef, method_resolution, op, - traits::{builtin::get_fn_trait, FnTrait, InEnvironment, SolutionVariables}, + traits::{FnTrait, InEnvironment, SolutionVariables}, utils::{generics, variant_data, Generics}, ApplicationTy, Binders, CallableDef, FnSig, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, TraitRef, Ty, TypeCtor, @@ -67,7 +67,7 @@ impl<'a> InferenceContext<'a> { if let Some(krate) = self.resolver.krate() { let fn_traits: Vec = [FnTrait::FnOnce, FnTrait::FnMut, FnTrait::Fn] .iter() - .filter_map(|f| get_fn_trait(self.db, krate, *f)) + .filter_map(|f| f.get_id(self.db, krate)) .collect(); for fn_trait in fn_traits { let fn_trait_data = self.db.trait_data(fn_trait); -- cgit v1.2.3 From f0c8058f1236474b22b69971524015558384c077 Mon Sep 17 00:00:00 2001 From: adamrk Date: Sat, 20 Jun 2020 11:04:46 +0200 Subject: Fixes to callable_sig_from_fn_trait --- crates/ra_hir_ty/src/infer/expr.rs | 130 ++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 8c924ad42..359befe4f 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -15,10 +15,10 @@ use ra_syntax::ast::RangeOp; use crate::{ autoderef, method_resolution, op, - traits::{FnTrait, InEnvironment, SolutionVariables}, + traits::{FnTrait, Guidance, InEnvironment, SolutionVariables}, utils::{generics, variant_data, Generics}, - ApplicationTy, Binders, CallableDef, FnSig, InferTy, IntTy, Mutability, Obligation, Rawness, - Substs, TraitRef, Ty, TypeCtor, + ApplicationTy, Binders, CallableDef, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, + TraitRef, Ty, TypeCtor, }; use super::{ @@ -63,72 +63,70 @@ impl<'a> InferenceContext<'a> { self.resolve_ty_as_possible(ty) } - fn callable_sig_from_fn_trait(&mut self, ty: &Ty) -> Option { - if let Some(krate) = self.resolver.krate() { - let fn_traits: Vec = [FnTrait::FnOnce, FnTrait::FnMut, FnTrait::Fn] - .iter() - .filter_map(|f| f.get_id(self.db, krate)) - .collect(); - for fn_trait in fn_traits { - let fn_trait_data = self.db.trait_data(fn_trait); - let generic_params = generics(self.db.upcast(), fn_trait.into()); - if generic_params.len() != 2 { - continue; - } - - let arg_ty = self.table.new_type_var(); - let substs = Substs::build_for_generics(&generic_params) - .push(ty.clone()) - .push(arg_ty.clone()) - .build(); - - let trait_ref = TraitRef { trait_: fn_trait, substs: substs.clone() }; - let trait_env = Arc::clone(&self.trait_env); - let implements_fn_goal = - self.canonicalizer().canonicalize_obligation(InEnvironment { - value: Obligation::Trait(trait_ref), - environment: trait_env, - }); - if let Some(Solution::Unique(SolutionVariables(solution))) = - self.db.trait_solve(krate, implements_fn_goal.value.clone()) - { - match solution.value.as_slice() { - [Ty::Apply(ApplicationTy { - ctor: TypeCtor::Tuple { cardinality: _ }, - parameters, - })] => { - let output_assoc_type = match fn_trait_data - .associated_types() - .collect::>() - .as_slice() - { - [output] => *output, - _ => { - continue; - } - }; - let output_proj_ty = crate::ProjectionTy { - associated_ty: output_assoc_type, - parameters: substs, - }; - let return_ty = self.normalize_projection_ty(output_proj_ty); - return Some(FnSig::from_params_and_return( - parameters.into_iter().map(|ty| ty.clone()).collect(), - return_ty, - )); - } - _ => (), - } - } + fn callable_sig_from_fn_trait(&mut self, ty: &Ty, num_args: usize) -> Option<(Vec, Ty)> { + let krate = self.resolver.krate()?; + let fn_traits: Vec = [FnTrait::FnOnce, FnTrait::FnMut, FnTrait::Fn] + .iter() + .filter_map(|f| f.get_id(self.db, krate)) + .collect(); + let fn_once_trait = FnTrait::FnOnce.get_id(self.db, krate)?; + let output_assoc_type = match self + .db + .trait_data(fn_once_trait) + .associated_types() + .collect::>() + .as_slice() + { + [output] => *output, + _ => { + return None; } }; + for fn_trait in fn_traits { + let generic_params = generics(self.db.upcast(), fn_trait.into()); + if generic_params.len() != 2 { + continue; + } + + let mut param_builder = Substs::builder(num_args); + for _ in 0..num_args { + param_builder = param_builder.push(self.table.new_type_var()); + } + let arg_ty = Ty::Apply(ApplicationTy { + ctor: TypeCtor::Tuple { cardinality: num_args as u16 }, + parameters: param_builder.build(), + }); + let substs = Substs::build_for_generics(&generic_params) + .push(ty.clone()) + .push(arg_ty.clone()) + .build(); + + let trait_ref = TraitRef { trait_: fn_trait, substs: substs.clone() }; + let trait_env = Arc::clone(&self.trait_env); + let implements_fn_goal = self.canonicalizer().canonicalize_obligation(InEnvironment { + value: Obligation::Trait(trait_ref), + environment: trait_env, + }); + let solution = match self.db.trait_solve(krate, implements_fn_goal.value.clone()) { + Some(Solution::Unique(SolutionVariables(solution))) + | Some(Solution::Ambig(Guidance::Definite(SolutionVariables(solution)))) + | Some(Solution::Ambig(Guidance::Suggested(SolutionVariables(solution)))) => { + solution + } + _ => continue, + }; + let output_proj_ty = + crate::ProjectionTy { associated_ty: output_assoc_type, parameters: substs }; + let return_ty = self.normalize_projection_ty(output_proj_ty); + return Some((solution.value, return_ty)); + } None } - pub fn callable_sig(&mut self, ty: &Ty) -> Option { + pub fn callable_sig(&mut self, ty: &Ty, num_args: usize) -> Option<(Vec, Ty)> { match ty.callable_sig(self.db) { - result @ Some(_) => result, - None => self.callable_sig_from_fn_trait(ty), + Some(sig) => Some((sig.params().to_vec(), sig.ret().clone())), + None => self.callable_sig_from_fn_trait(ty, num_args), } } @@ -278,8 +276,10 @@ impl<'a> InferenceContext<'a> { ); let (param_tys, ret_ty): (Vec, Ty) = derefs .find_map(|callee_deref_ty| { - self.callable_sig(&canonicalized.decanonicalize_ty(callee_deref_ty.value)) - .map(|sig| (sig.params().to_vec(), sig.ret().clone())) + self.callable_sig( + &canonicalized.decanonicalize_ty(callee_deref_ty.value), + args.len(), + ) }) .unwrap_or((Vec::new(), Ty::Unknown)); self.register_obligations_for_call(&callee_ty); -- cgit v1.2.3 From d8f5192d99886c89418879cc7d81ba298b0596db Mon Sep 17 00:00:00 2001 From: adamrk Date: Sat, 20 Jun 2020 11:53:55 +0200 Subject: Get Output assoc type by name --- crates/ra_hir_ty/src/infer/expr.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 359befe4f..171330274 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -10,7 +10,7 @@ use hir_def::{ resolver::resolver_for_expr, AdtId, AssocContainerId, FieldId, Lookup, }; -use hir_expand::name::Name; +use hir_expand::name::{name, Name}; use ra_syntax::ast::RangeOp; use crate::{ @@ -70,18 +70,8 @@ impl<'a> InferenceContext<'a> { .filter_map(|f| f.get_id(self.db, krate)) .collect(); let fn_once_trait = FnTrait::FnOnce.get_id(self.db, krate)?; - let output_assoc_type = match self - .db - .trait_data(fn_once_trait) - .associated_types() - .collect::>() - .as_slice() - { - [output] => *output, - _ => { - return None; - } - }; + let output_assoc_type = + self.db.trait_data(fn_once_trait).associated_type_by_name(&name![Output])?; for fn_trait in fn_traits { let generic_params = generics(self.db.upcast(), fn_trait.into()); if generic_params.len() != 2 { -- cgit v1.2.3 From 1629fb770e21c7e7fd4c478f5074590d5c9e6829 Mon Sep 17 00:00:00 2001 From: adamrk Date: Sat, 20 Jun 2020 17:00:57 +0200 Subject: Push obligation instead of matching on solution --- crates/ra_hir_ty/src/infer/expr.rs | 77 ++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 41 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 171330274..a9565a58d 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -15,7 +15,7 @@ use ra_syntax::ast::RangeOp; use crate::{ autoderef, method_resolution, op, - traits::{FnTrait, Guidance, InEnvironment, SolutionVariables}, + traits::{FnTrait, InEnvironment}, utils::{generics, variant_data, Generics}, ApplicationTy, Binders, CallableDef, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, TraitRef, Ty, TypeCtor, @@ -23,7 +23,7 @@ use crate::{ use super::{ find_breakable, BindingMode, BreakableContext, Diverges, Expectation, InferenceContext, - InferenceDiagnostic, Solution, TypeMismatch, + InferenceDiagnostic, TypeMismatch, }; impl<'a> InferenceContext<'a> { @@ -65,52 +65,47 @@ impl<'a> InferenceContext<'a> { fn callable_sig_from_fn_trait(&mut self, ty: &Ty, num_args: usize) -> Option<(Vec, Ty)> { let krate = self.resolver.krate()?; - let fn_traits: Vec = [FnTrait::FnOnce, FnTrait::FnMut, FnTrait::Fn] - .iter() - .filter_map(|f| f.get_id(self.db, krate)) - .collect(); let fn_once_trait = FnTrait::FnOnce.get_id(self.db, krate)?; let output_assoc_type = self.db.trait_data(fn_once_trait).associated_type_by_name(&name![Output])?; - for fn_trait in fn_traits { - let generic_params = generics(self.db.upcast(), fn_trait.into()); - if generic_params.len() != 2 { - continue; - } - - let mut param_builder = Substs::builder(num_args); - for _ in 0..num_args { - param_builder = param_builder.push(self.table.new_type_var()); - } - let arg_ty = Ty::Apply(ApplicationTy { - ctor: TypeCtor::Tuple { cardinality: num_args as u16 }, - parameters: param_builder.build(), - }); - let substs = Substs::build_for_generics(&generic_params) - .push(ty.clone()) - .push(arg_ty.clone()) - .build(); - - let trait_ref = TraitRef { trait_: fn_trait, substs: substs.clone() }; - let trait_env = Arc::clone(&self.trait_env); - let implements_fn_goal = self.canonicalizer().canonicalize_obligation(InEnvironment { - value: Obligation::Trait(trait_ref), - environment: trait_env, - }); - let solution = match self.db.trait_solve(krate, implements_fn_goal.value.clone()) { - Some(Solution::Unique(SolutionVariables(solution))) - | Some(Solution::Ambig(Guidance::Definite(SolutionVariables(solution)))) - | Some(Solution::Ambig(Guidance::Suggested(SolutionVariables(solution)))) => { - solution - } - _ => continue, - }; + let generic_params = generics(self.db.upcast(), fn_once_trait.into()); + if generic_params.len() != 2 { + return None; + } + + let mut param_builder = Substs::builder(num_args); + let mut arg_tys = vec![]; + for _ in 0..num_args { + let arg = self.table.new_type_var(); + param_builder = param_builder.push(arg.clone()); + arg_tys.push(arg); + } + let parameters = param_builder.build(); + let arg_ty = Ty::Apply(ApplicationTy { + ctor: TypeCtor::Tuple { cardinality: num_args as u16 }, + parameters, + }); + let substs = Substs::build_for_generics(&generic_params) + .push(ty.clone()) + .push(arg_ty.clone()) + .build(); + + let trait_env = Arc::clone(&self.trait_env); + let implements_fn_trait = + Obligation::Trait(TraitRef { trait_: fn_once_trait, substs: substs.clone() }); + let goal = self.canonicalizer().canonicalize_obligation(InEnvironment { + value: implements_fn_trait.clone(), + environment: trait_env, + }); + if self.db.trait_solve(krate, goal.value).is_some() { + self.obligations.push(implements_fn_trait); let output_proj_ty = crate::ProjectionTy { associated_ty: output_assoc_type, parameters: substs }; let return_ty = self.normalize_projection_ty(output_proj_ty); - return Some((solution.value, return_ty)); + Some((arg_tys, return_ty)) + } else { + None } - None } pub fn callable_sig(&mut self, ty: &Ty, num_args: usize) -> Option<(Vec, Ty)> { -- cgit v1.2.3