Skip to content

Commit

Permalink
Add regression test for issue #16739
Browse files Browse the repository at this point in the history
  • Loading branch information
bkoropoff committed Oct 17, 2014
1 parent 4a4a434 commit f4cb9f4
Showing 1 changed file with 42 additions and 0 deletions.
42 changes: 42 additions & 0 deletions src/test/run-pass/issue-16739.rs
@@ -0,0 +1,42 @@
// 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)]

// Test that unboxing shim for calling rust-call ABI methods through a
// trait box works and does not cause an ICE

struct Foo { foo: uint }

impl FnOnce<(), uint> for Foo {
#[rust_call_abi_hack]
fn call_once(self, _: ()) -> uint { self.foo }
}

impl FnOnce<(uint,), uint> for Foo {
#[rust_call_abi_hack]
fn call_once(self, (x,): (uint,)) -> uint { self.foo + x }
}

impl FnOnce<(uint, uint), uint> for Foo {
#[rust_call_abi_hack]
fn call_once(self, (x, y): (uint, uint)) -> uint { self.foo + x + y }
}

fn main() {
let f = box Foo { foo: 42 } as Box<FnOnce<(), uint>>;
assert_eq!(f.call_once(()), 42);

let f = box Foo { foo: 40 } as Box<FnOnce<(uint,), uint>>;
assert_eq!(f.call_once((2,)), 42);

let f = box Foo { foo: 40 } as Box<FnOnce<(uint, uint), uint>>;
assert_eq!(f.call_once((1, 1)), 42);
}

5 comments on commit f4cb9f4

@bors
Copy link
Contributor

@bors bors commented on f4cb9f4 Oct 18, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at bkoropoff@f4cb9f4

@bors
Copy link
Contributor

@bors bors commented on f4cb9f4 Oct 18, 2014

Choose a reason for hiding this comment

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

merging bkoropoff/rust/issue-16739 = f4cb9f4 into auto

@bors
Copy link
Contributor

@bors bors commented on f4cb9f4 Oct 18, 2014

Choose a reason for hiding this comment

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

bkoropoff/rust/issue-16739 = f4cb9f4 merged ok, testing candidate = 1c82e60

@bors
Copy link
Contributor

@bors bors commented on f4cb9f4 Oct 18, 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 f4cb9f4 Oct 18, 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 = 1c82e60

Please sign in to comment.