Skip to content

Commit ef5f14d

Browse files
committed
---
yaml --- r: 34173 b: refs/heads/snap-stage3 c: 6899872 h: refs/heads/master i: 34171: 66c54b9 v: v3
1 parent 6f85844 commit ef5f14d

File tree

10 files changed

+56
-9
lines changed

10 files changed

+56
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d6d12d90ff5363f59f1a1bf67f999a5d7944abb1
4+
refs/heads/snap-stage3: 68998724c6f3ece600aa881d74c1ed1fa0410a7b
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/int-template.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
#[forbid(deprecated_mode)];
1313
#[forbid(deprecated_pattern)];
1414

15+
#[cfg(stage0)]
16+
use T = inst::T;
17+
#[cfg(stage1)]
18+
#[cfg(stage2)]
1519
use T = self::inst::T;
1620

1721
use cmp::{Eq, Ord};

branches/snap-stage3/src/libcore/int-template/int.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
//! Operations and constants for `int`
1212
13+
#[cfg(stage0)]
14+
pub use inst::pow;
15+
#[cfg(stage1)]
16+
#[cfg(stage2)]
1317
pub use self::inst::pow;
1418

1519
mod inst {

branches/snap-stage3/src/libcore/iter-trait.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717

1818
use cmp::{Eq, Ord};
1919

20+
#[cfg(stage0)]
21+
use inst::{IMPL_T, EACH, SIZE_HINT};
22+
#[cfg(stage1)]
23+
#[cfg(stage2)]
2024
use self::inst::{IMPL_T, EACH, SIZE_HINT};
2125

2226
impl<A> IMPL_T<A>: iter::BaseIter<A> {

branches/snap-stage3/src/libcore/kinds.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ pub trait Copy {
4444
// Empty.
4545
}
4646

47+
#[cfg(stage0)]
48+
#[lang="send"]
49+
pub trait Owned {
50+
// Empty.
51+
}
52+
53+
#[cfg(stage1)]
54+
#[cfg(stage2)]
55+
#[cfg(stage3)]
4756
#[lang="owned"]
4857
pub trait Owned {
4958
// Empty.
@@ -54,6 +63,15 @@ pub trait Const {
5463
// Empty.
5564
}
5665

66+
#[cfg(stage0)]
67+
#[lang="owned"]
68+
pub trait Durable {
69+
// Empty.
70+
}
71+
72+
#[cfg(stage1)]
73+
#[cfg(stage2)]
74+
#[cfg(stage3)]
5775
#[lang="durable"]
5876
pub trait Durable {
5977
// Empty.

branches/snap-stage3/src/libcore/uint-template.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
#[forbid(deprecated_mode)];
1313
#[forbid(deprecated_pattern)];
1414

15+
#[cfg(stage0)]
16+
use T = inst::T;
17+
#[cfg(stage1)]
18+
#[cfg(stage2)]
1519
use T = self::inst::T;
1620

1721
use cmp::{Eq, Ord};

branches/snap-stage3/src/libcore/uint-template/u8.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
//! Operations and constants for `u8`
1212
13+
#[cfg(stage0)]
14+
pub use inst::is_ascii;
15+
#[cfg(stage1)]
16+
#[cfg(stage2)]
1317
pub use self::inst::is_ascii;
1418

1519
mod inst {

branches/snap-stage3/src/libcore/uint-template/uint.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010

1111
//! Operations and constants for `uint`
1212
13+
#[cfg(stage0)]
14+
pub use inst::{
15+
div_ceil, div_round, div_floor, iterate,
16+
next_power_of_two
17+
};
18+
#[cfg(stage1)]
19+
#[cfg(stage2)]
1320
pub use self::inst::{
1421
div_ceil, div_round, div_floor, iterate,
1522
next_power_of_two

branches/snap-stage3/src/libstd/priority_queue.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,20 @@ impl <T: Ord> PriorityQueue<T> {
8080
}
8181

8282
/// Consume the PriorityQueue and return the underlying vector
83+
#[cfg(stage0)]
84+
pure fn to_vec(self) -> ~[T] { fail }
85+
#[cfg(stage1)]
86+
#[cfg(stage2)]
87+
#[cfg(stage3)]
8388
pure fn to_vec(self) -> ~[T] { let PriorityQueue{data: v} = self; v }
8489

8590
/// Consume the PriorityQueue and return a vector in sorted
8691
/// (ascending) order
92+
#[cfg(stage0)]
93+
pure fn to_sorted_vec(self) -> ~[T] { fail }
94+
#[cfg(stage1)]
95+
#[cfg(stage2)]
96+
#[cfg(stage3)]
8797
pure fn to_sorted_vec(self) -> ~[T] {
8898
let mut q = self;
8999
let mut end = q.len();

branches/snap-stage3/src/snapshots.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
S 2012-12-14 dbc52ce
2-
macos-i386 994697c57810b8f139d71df47024512970db860c
3-
macos-x86_64 f8faa6a80b0b98b27ceee6fec71ded7ca058104d
4-
linux-i386 238389613220fac131647a67efadc9e20f09c21a
5-
linux-x86_64 8f27f367866d3d52300d7e5d75f602a220bef6fb
6-
winnt-i386 92ac1ac09a262a59f40160c9dcf535e1c8ea8e75
7-
freebsd-x86_64 d39ff0cbd7fdf04de55baea9d4003705f5ff6441
8-
91
S 2012-12-08 6630d75
102
macos-i386 cdb0f0ebe99b8fea7688d9ae32860a63d1e05399
113
macos-x86_64 c509dc252be6e1c5cf862c659235dc94bde397aa

0 commit comments

Comments
 (0)