mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch back callable_sig for known fn types

Browse Source
This commit is contained in:
adamrk 2020-06-20 08:13:14 +02:00
parent 3f94a90c7b
commit cf870af807
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir_ty/src/infer/coerce.rs
View File

@ -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);

2
crates/ra_hir_ty/src/infer/expr.rs
View File

@ -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())