Skip to content

Commit 15e157e

Browse files
author
James Miller
committed
---
yaml --- r: 140647 b: refs/heads/try2 c: 414970c h: refs/heads/master i: 140645: 06bfcd9 140643: babd7d8 140639: 594a443 v: v3
1 parent 95eca65 commit 15e157e

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 57509709b4ecc31b04b765bd07cd5fe672667e43
8+
refs/heads/try2: 414970c46f75c730d7fed029deb48b0d1c454391
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/priority_queue.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ use core::old_iter::BaseIter;
1616
extern "rust-intrinsic" mod rusti {
1717
fn move_val_init<T>(dst: &mut T, src: T);
1818
fn init<T>() -> T;
19+
#[cfg(not(stage0))]
20+
fn uninit<T>() -> T;
1921
}
2022

2123
pub struct PriorityQueue<T> {

branches/try2/src/libstd/rc.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ mod test_rc {
114114
#[abi = "rust-intrinsic"]
115115
extern "rust-intrinsic" mod rusti {
116116
fn init<T>() -> T;
117+
#[cfg(not(stage0))]
118+
fn uninit<T>() -> T;
117119
}
118120

119121
#[deriving(Eq)]

0 commit comments

Comments
 (0)