From ec2e05194f02fea51ad19de3498b9f6818166f1c Mon Sep 17 00:00:00 2001 From: James Miller Date: Thu, 29 Sep 2016 17:07:03 +1300 Subject: [PATCH] Resolve the callee type in check_call before autoderef If the callee type is an associated type, then it needs to be normalized before trying to deref it. This matches the behaviour of `check_method_call` for autoderef behaviour in calls. Fixes #36786 --- src/librustc_typeck/check/callee.rs | 3 ++- src/test/run-pass/issue-36786-resolve-call.rs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/test/run-pass/issue-36786-resolve-call.rs diff --git a/src/librustc_typeck/check/callee.rs b/src/librustc_typeck/check/callee.rs index d1fb0736d2115..75c1d28f7d830 100644 --- a/src/librustc_typeck/check/callee.rs +++ b/src/librustc_typeck/check/callee.rs @@ -47,8 +47,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { expected: Expectation<'tcx>) -> Ty<'tcx> { let original_callee_ty = self.check_expr(callee_expr); + let expr_ty = self.structurally_resolved_type(call_expr.span, original_callee_ty); - let mut autoderef = self.autoderef(callee_expr.span, original_callee_ty); + let mut autoderef = self.autoderef(callee_expr.span, expr_ty); let result = autoderef.by_ref().flat_map(|(adj_ty, idx)| { self.try_overloaded_call_step(call_expr, callee_expr, adj_ty, idx) }).next(); diff --git a/src/test/run-pass/issue-36786-resolve-call.rs b/src/test/run-pass/issue-36786-resolve-call.rs new file mode 100644 index 0000000000000..0d718c7ba4683 --- /dev/null +++ b/src/test/run-pass/issue-36786-resolve-call.rs @@ -0,0 +1,17 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Ensure that types that rely on obligations are autoderefed +// correctly + +fn main() { + let x : Vec> = vec![Box::new(|| ())]; + x[0]() +}