Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add regression test for issue #16739
- Loading branch information
Showing
1 changed file
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} |
f4cb9f4
There was a problem hiding this comment.
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
f4cb9f4
There was a problem hiding this comment.
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
f4cb9f4
There was a problem hiding this comment.
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
f4cb9f4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1861
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1860
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1853
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1860
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1854
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1853
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1853
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1857
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1851
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1850
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1853
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1508
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1508
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1511
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/348
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/349
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/340
f4cb9f4
There was a problem hiding this comment.
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