Skip to content

Commit bc555ac

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 190922 b: refs/heads/auto c: 5b118f5 h: refs/heads/master v: v3
1 parent 312476f commit bc555ac

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
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: b2f37554bf9f2b55fa6ba6ba8e8eaf1826301b4e
13+
refs/heads/auto: 5b118f5ecde796ad62fa349a045d7ad8129b711c
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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