Skip to content

Commit 7d26e95

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 191329 b: refs/heads/try c: 5b118f5 h: refs/heads/master i: 191327: fb3ef19 v: v3
1 parent 441c96b commit 7d26e95

File tree

18 files changed

+1169
-5
lines changed

18 files changed

+1169
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 809a554fca2d0ebc2ba50077016fe282a4064752
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c64d671671aea2e44ee7fc6eb00ee75fc30ed7b9
5-
refs/heads/try: b2f37554bf9f2b55fa6ba6ba8e8eaf1826301b4e
5+
refs/heads/try: 5b118f5ecde796ad62fa349a045d7ad8129b711c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcollections/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![feature(box_syntax)]
2828
#![feature(box_patterns)]
2929
#![feature(core)]
30+
#![feature(lang_items)]
3031
#![feature(staged_api)]
3132
#![feature(unboxed_closures)]
3233
#![feature(unicode)]
@@ -162,7 +163,10 @@ mod prelude {
162163

163164
// in core and collections (may differ).
164165
pub use slice::{AsSlice, SliceExt};
166+
#[cfg(stage0)]
165167
pub use str::{Str, StrExt};
168+
#[cfg(not(stage0))]
169+
pub use str::Str;
166170

167171
// from other crates.
168172
pub use alloc::boxed::Box;

0 commit comments

Comments
 (0)