diff options
| author | bors <bors@rust-lang.org> | 2013-10-10 22:51:20 -0700 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-10 22:51:20 -0700 | 
| commit | 5bddcc1eadeafd2461f7026d7c1f5c70980c1f06 (patch) | |
| tree | 874e420327dc8ae2a0d576d9fda78bfe4bdf2cd0 /src | |
| parent | e5fc0ca6dcc748d1534367343489ff6251afb4b2 (diff) | |
| parent | 478c9b701e034a14ee55b11776cd58945d0ed560 (diff) | |
| download | rust-5bddcc1eadeafd2461f7026d7c1f5c70980c1f06.tar.gz rust-5bddcc1eadeafd2461f7026d7c1f5c70980c1f06.zip  | |
auto merge of #9805 : alexcrichton/rust/needstest, r=brson
Closes #4545 Closes #5791 Closes #6470 Closes #8044
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/auxiliary/issue-4545.rs | 12 | ||||
| -rw-r--r-- | src/test/auxiliary/issue-8044.rs | 27 | ||||
| -rw-r--r-- | src/test/run-pass/issue-4545.rs | 15 | ||||
| -rw-r--r-- | src/test/run-pass/issue-5791.rs | 20 | ||||
| -rw-r--r-- | src/test/run-pass/issue-6470.rs | 5 | ||||
| -rw-r--r-- | src/test/run-pass/issue-8044.rs | 19 | 
6 files changed, 94 insertions, 4 deletions
diff --git a/src/test/auxiliary/issue-4545.rs b/src/test/auxiliary/issue-4545.rs new file mode 100644 index 00000000000..29feeaa7d92 --- /dev/null +++ b/src/test/auxiliary/issue-4545.rs @@ -0,0 +1,12 @@ +// 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. + +pub struct S<T>(Option<T>); +pub fn mk<T>() -> S<T> { S(None) } diff --git a/src/test/auxiliary/issue-8044.rs b/src/test/auxiliary/issue-8044.rs new file mode 100644 index 00000000000..7d9a4b60384 --- /dev/null +++ b/src/test/auxiliary/issue-8044.rs @@ -0,0 +1,27 @@ +// 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. + +#[feature(struct_variant)]; + +pub struct BTree<V> { + node: TreeItem<V>, +} + +pub enum TreeItem<V> { + TreeLeaf { value: V }, +} + +pub fn leaf<V>(value: V) -> TreeItem<V> { + TreeLeaf { value: value } +} + +fn main() { + BTree::<int> { node: leaf(1) }; +} diff --git a/src/test/run-pass/issue-4545.rs b/src/test/run-pass/issue-4545.rs new file mode 100644 index 00000000000..834e09859f6 --- /dev/null +++ b/src/test/run-pass/issue-4545.rs @@ -0,0 +1,15 @@ +// 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. + +// xfail-fast windows doesn't like aux-build +// aux-build:issue-4545.rs + +extern mod somelib(name = "issue-4545"); +fn main() { somelib::mk::<int>(); } diff --git a/src/test/run-pass/issue-5791.rs b/src/test/run-pass/issue-5791.rs new file mode 100644 index 00000000000..251ae2f3194 --- /dev/null +++ b/src/test/run-pass/issue-5791.rs @@ -0,0 +1,20 @@ +// 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. + +use std::libc; + +extern { + #[link_name = "malloc"] + fn malloc1(len: libc::c_int) -> *libc::c_void; + #[link_name = "malloc"] + fn malloc2(len: libc::c_int, foo: libc::c_int) -> *libc::c_void; +} + +pub fn main () {} diff --git a/src/test/run-pass/issue-6470.rs b/src/test/run-pass/issue-6470.rs index 73d0e181da0..a16108452bc 100644 --- a/src/test/run-pass/issue-6470.rs +++ b/src/test/run-pass/issue-6470.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// xfail-test - pub mod Bar { pub struct Foo { v: int, @@ -21,5 +19,4 @@ pub mod Bar { } } -fn main() { } - +pub fn main() { } diff --git a/src/test/run-pass/issue-8044.rs b/src/test/run-pass/issue-8044.rs new file mode 100644 index 00000000000..d8e0085ed87 --- /dev/null +++ b/src/test/run-pass/issue-8044.rs @@ -0,0 +1,19 @@ +// 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. + +// xfail-fast windows doesn't like aux-build +// aux-build:issue-8044.rs + +extern mod minimal(name= "issue-8044"); +use minimal::{BTree, leaf}; + +fn main() { + BTree::<int> { node: leaf(1) }; +}  | 
