Skip to content

Commit 5bddcc1

Browse files
committed
auto merge of #9805 : alexcrichton/rust/needstest, r=brson
Closes #4545 Closes #5791 Closes #6470 Closes #8044
2 parents e5fc0ca + 478c9b7 commit 5bddcc1

File tree

6 files changed

+94
-4
lines changed

6 files changed

+94
-4
lines changed

src/test/auxiliary/issue-4545.rs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub struct S<T>(Option<T>);
12+
pub fn mk<T>() -> S<T> { S(None) }

src/test/auxiliary/issue-8044.rs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[feature(struct_variant)];
12+
13+
pub struct BTree<V> {
14+
node: TreeItem<V>,
15+
}
16+
17+
pub enum TreeItem<V> {
18+
TreeLeaf { value: V },
19+
}
20+
21+
pub fn leaf<V>(value: V) -> TreeItem<V> {
22+
TreeLeaf { value: value }
23+
}
24+
25+
fn main() {
26+
BTree::<int> { node: leaf(1) };
27+
}

src/test/run-pass/issue-4545.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// xfail-fast windows doesn't like aux-build
12+
// aux-build:issue-4545.rs
13+
14+
extern mod somelib(name = "issue-4545");
15+
fn main() { somelib::mk::<int>(); }

src/test/run-pass/issue-5791.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::libc;
12+
13+
extern {
14+
#[link_name = "malloc"]
15+
fn malloc1(len: libc::c_int) -> *libc::c_void;
16+
#[link_name = "malloc"]
17+
fn malloc2(len: libc::c_int, foo: libc::c_int) -> *libc::c_void;
18+
}
19+
20+
pub fn main () {}

src/test/run-pass/issue-6470.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
12-
1311
pub mod Bar {
1412
pub struct Foo {
1513
v: int,
@@ -21,5 +19,4 @@ pub mod Bar {
2119
}
2220
}
2321

24-
fn main() { }
25-
22+
pub fn main() { }

src/test/run-pass/issue-8044.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// xfail-fast windows doesn't like aux-build
12+
// aux-build:issue-8044.rs
13+
14+
extern mod minimal(name= "issue-8044");
15+
use minimal::{BTree, leaf};
16+
17+
fn main() {
18+
BTree::<int> { node: leaf(1) };
19+
}

0 commit comments

Comments
 (0)