-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6ad1d0f
commit 478c9b7
Showing
6 changed files
with
94 additions
and
4 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,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) } |
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,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) }; | ||
} |
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,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>(); } |
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,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 () {} |
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
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,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) }; | ||
} |
478c9b7
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 brson
at alexcrichton@478c9b7
478c9b7
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 alexcrichton/rust/needstest = 478c9b7 into auto
478c9b7
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.
alexcrichton/rust/needstest = 478c9b7 merged ok, testing candidate = 5bddcc1
478c9b7
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/1942
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1947
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1960
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1961
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1132
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1945
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1051
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1052
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1730
478c9b7
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 = 5bddcc1