Skip to content

Commit b8de29b

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 193828 b: refs/heads/beta c: 5b118f5 h: refs/heads/master v: v3
1 parent be93244 commit b8de29b

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: b2f37554bf9f2b55fa6ba6ba8e8eaf1826301b4e
34+
refs/heads/beta: 5b118f5ecde796ad62fa349a045d7ad8129b711c
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/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)