Skip to content

Commit c1c244b

Browse files
committed
---
yaml --- r: 151710 b: refs/heads/try2 c: 8211539 h: refs/heads/master v: v3
1 parent 248334d commit c1c244b

File tree

5 files changed

+11
-110
lines changed

5 files changed

+11
-110
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: 912a9675c0b7f9e8c836983e525b180c48693925
8+
refs/heads/try2: 8211539114df8b6e3a9b8b251fa57cb5a77d2f14
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ pub mod slice;
116116
pub mod str;
117117
pub mod tuple;
118118

119-
#[cfg(stage0, not(test))]
120-
pub mod owned;
121-
122119
// FIXME: this module should not exist. Once owned allocations are no longer a
123120
// language type, this module can move outside to the owned allocation
124121
// crate.

branches/try2/src/libcore/owned.rs

Lines changed: 0 additions & 101 deletions
This file was deleted.

branches/try2/src/libstd/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,13 @@ extern crate core;
133133
#[cfg(test)] pub use ops = realstd::ops;
134134
#[cfg(test)] pub use cmp = realstd::cmp;
135135
#[cfg(test)] pub use ty = realstd::ty;
136-
#[cfg(not(stage0), test)] pub use owned = realstd::owned;
136+
#[cfg(test)] pub use owned = realstd::owned;
137137

138138
#[cfg(not(test))] pub use cmp = core::cmp;
139139
#[cfg(not(test))] pub use kinds = core::kinds;
140140
#[cfg(not(test))] pub use ops = core::ops;
141141
#[cfg(not(test))] pub use ty = core::ty;
142142

143-
#[cfg(stage0, test)] pub use owned = realstd::owned;
144-
#[cfg(stage0, not(test))] pub use owned = core::owned;
145-
146143
pub use core::any;
147144
pub use core::bool;
148145
pub use core::cell;
@@ -209,7 +206,7 @@ pub mod ascii;
209206

210207
pub mod rc;
211208
pub mod gc;
212-
#[cfg(not(stage0), not(test))]
209+
#[cfg(not(test))]
213210
pub mod owned;
214211

215212
/* Common traits */

branches/try2/src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-05-15 6a2b3d1
2+
freebsd-x86_64 afc98b59cb819025fecdb9d145ca4463f857a477
3+
linux-i386 d6f7a404412ea34db3d19814ca21fe6fa662b02f
4+
linux-x86_64 3dfb54406a7ea75565a7ea3071daad885cb91775
5+
macos-i386 bebb937551d601ad908c9e4eaa196cc7a977c503
6+
macos-x86_64 08346ed401ad2891c7d2ba0aac0960f6e77bb78b
7+
winnt-i386 ad8e5b8292a00f60f1f7dc2e35bd18abeb5b858d
8+
19
S 2014-05-11 72fc4a5
210
freebsd-x86_64 82db6355b0b7c8023c8845a74e2f224da2831b50
311
linux-i386 91901299d5f86f5b67377d940073908a1f0e4e82

0 commit comments

Comments
 (0)