From 21d12c029700adc158c5fb466384ccd8562a6915 Mon Sep 17 00:00:00 2001 From: Barosl Lee Date: Mon, 8 Dec 2014 16:28:14 +0900 Subject: [PATCH] typeck: Make the supplied parameters to be a tuple When a type error occurs, check_method_argument_types() tries to provide arguments filled with ty::mk_err(). However, if a function takes the parameters as a tuple, the arguments should be converted to a tuple before being passed to check_argument_types(). Fixes #19521. --- src/librustc_typeck/check/mod.rs | 8 +++++++- src/test/compile-fail/issue-19521.rs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/test/compile-fail/issue-19521.rs diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 8288cce3958..1a8b06ec12d 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -2623,7 +2623,13 @@ fn check_method_argument_types<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, tuple_arguments: TupleArgumentsFlag) -> ty::FnOutput<'tcx> { if ty::type_is_error(method_fn_ty) { - let err_inputs = err_args(args_no_rcvr.len()); + let err_inputs = err_args(args_no_rcvr.len()); + + let err_inputs = match tuple_arguments { + DontTupleArguments => err_inputs, + TupleArguments => vec![ty::mk_tup(fcx.tcx(), err_inputs)], + }; + check_argument_types(fcx, sp, err_inputs.as_slice(), diff --git a/src/test/compile-fail/issue-19521.rs b/src/test/compile-fail/issue-19521.rs new file mode 100644 index 00000000000..61cff598b2a --- /dev/null +++ b/src/test/compile-fail/issue-19521.rs @@ -0,0 +1,15 @@ +// Copyright 2014 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. + +#![feature(unboxed_closures)] + +fn main() { + "".homura()(); //~ ERROR does not implement any method +} -- 2.44.0