Skip to content

Commit

Permalink
typeck: Make the supplied parameters to be a tuple
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
barosl committed Dec 10, 2014
1 parent 4c692d3 commit 21d12c0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/librustc_typeck/check/mod.rs
Expand Up @@ -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(),
Expand Down
15 changes: 15 additions & 0 deletions 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
}

5 comments on commit 21d12c0

@bors
Copy link
Contributor

@bors bors commented on 21d12c0 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jakub
at barosl@21d12c0

@bors
Copy link
Contributor

@bors bors commented on 21d12c0 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging barosl/rust/typeck-tupled-arguments-ice = 21d12c0 into auto

@bors
Copy link
Contributor

@bors bors commented on 21d12c0 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

barosl/rust/typeck-tupled-arguments-ice = 21d12c0 merged ok, testing candidate = fddec2d

@bors
Copy link
Contributor

@bors bors commented on 21d12c0 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 21d12c0 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = fddec2d

Please sign in to comment.