Skip to content

Commit

Permalink
Add regression test for rust-lang#16790, rust-lang#18378 and rust-lan…
Browse files Browse the repository at this point in the history
  • Loading branch information
bkoropoff committed Nov 2, 2014
1 parent 9b322a6 commit bfa5320
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
26 changes: 26 additions & 0 deletions src/test/auxiliary/unboxed-closures-cross-crate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// 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, overloaded_calls)]

#[inline]
pub fn has_closures() -> uint {
let x = 1u;
let mut f = move |&mut:| x;
let y = 1u;
let g = |:| y;
f() + g()
}

pub fn has_generic_closures<T: Add<T,T> + Copy>(x: T, y: T) -> T {
let mut f = move |&mut:| x;
let g = |:| y;
f() + g()
}
20 changes: 20 additions & 0 deletions src/test/run-pass/unboxed-closures-cross-crate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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.

// Test that unboxed closures work with cross-crate inlining
// Acts as a regression test for #16790, #18378 and #18543

// aux-build:unboxed-closures-cross-crate.rs
extern crate "unboxed-closures-cross-crate" as ubcc;

fn main() {
assert_eq!(ubcc::has_closures(), 2u);
assert_eq!(ubcc::has_generic_closures(2u, 3u), 5u);
}

2 comments on commit bfa5320

@nrc
Copy link

@nrc nrc commented on bfa5320 Nov 4, 2014

Choose a reason for hiding this comment

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

r+

@alexcrichton
Copy link

Choose a reason for hiding this comment

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

@bors: retry

Please sign in to comment.