Skip to content

Commit

Permalink
fix ICE after incorrect number of args in calls
Browse files Browse the repository at this point in the history
  • Loading branch information
lifthrasiir committed Feb 19, 2013
1 parent acc1477 commit f513c56
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/check/mod.rs
Expand Up @@ -1198,7 +1198,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,

tcx.sess.span_err(sp, msg);

vec::from_fn(expected_arg_count, |_| ty::mk_err(tcx))
vec::from_fn(supplied_arg_count, |_| ty::mk_err(tcx))
};

sig.output
Expand Down
14 changes: 14 additions & 0 deletions src/test/compile-fail/issue-4935.rs
@@ -0,0 +1,14 @@
// Copyright 2013 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.

// Regresion test for issue #4935

fn foo(a: uint) {}
fn main() { foo(5, 6) } //~ ERROR this function takes 1 parameter but 2 parameters were supplied

8 comments on commit f513c56

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

saw approval from catamorphism
at lifthrasiir@f513c56

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

merging lifthrasiir/rust/issue-4935 = f513c56 into auto

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

lifthrasiir/rust/issue-4935 = f513c56 merged ok, testing candidate = 13e95ffa

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

No active merge of candidate f513c56 found, likely manual push to incoming

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

merging lifthrasiir/rust/issue-4935 = f513c56 into auto

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

lifthrasiir/rust/issue-4935 = f513c56 merged ok, testing candidate = a782efc

@bors
Copy link
Contributor

@bors bors commented on f513c56 Feb 19, 2013

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 f513c56 Feb 19, 2013

Choose a reason for hiding this comment

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

fast-forwarding incoming to auto = a782efc

Please sign in to comment.