Skip to content

Commit 0b0af08

Browse files
committed
---
yaml --- r: 178463 b: refs/heads/try c: c64a96d h: refs/heads/master i: 178461: 502b1c5 178459: 9cf1cda 178455: 5bdc2d6 178447: 4237ee7 178431: ffdfc35 v: v3
1 parent eddf89b commit 0b0af08

File tree

6 files changed

+15
-1
lines changed

6 files changed

+15
-1
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: 336c8d2e9c6b276b162bdb3edd43706372e6eddd
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 474b324eda10440d6568ef872a7307d38e7de95b
5-
refs/heads/try: a9d465fec902588b71937de96e66d160d2adebf5
5+
refs/heads/try: c64a96d385fb3b23c6744cf8d927c9c175936b5f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcollections/slice.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ use core::iter::{range_step, MultiplicativeIterator};
9898
use core::marker::Sized;
9999
use core::mem::size_of;
100100
use core::mem;
101+
#[cfg(stage0)]
101102
use core::ops::{FnMut, FullRange};
103+
#[cfg(not(stage0))]
104+
use core::ops::FnMut;
102105
use core::option::Option::{self, Some, None};
103106
use core::ptr::PtrExt;
104107
use core::ptr;
@@ -1509,7 +1512,10 @@ mod tests {
15091512
use core::prelude::{Some, None, range, Clone};
15101513
use core::prelude::{Iterator, IteratorExt};
15111514
use core::prelude::{AsSlice};
1515+
#[cfg(stage0)]
15121516
use core::prelude::{Ord, FullRange};
1517+
#[cfg(not(stage0))]
1518+
use core::prelude::Ord;
15131519
use core::default::Default;
15141520
use core::mem;
15151521
use std::iter::RandomAccessIterator;

branches/try/src/libcollections/string.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ mod tests {
995995
use str::Utf8Error;
996996
use core::iter::repeat;
997997
use super::{as_string, CowString};
998+
#[cfg(stage0)]
998999
use core::ops::FullRange;
9991000

10001001
#[test]

branches/try/src/libcollections/vec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,7 @@ mod tests {
18961896
use prelude::*;
18971897
use core::mem::size_of;
18981898
use core::iter::repeat;
1899+
#[cfg(stage0)]
18991900
use core::ops::FullRange;
19001901
use test::Bencher;
19011902
use super::as_vec;

branches/try/src/libcore/array.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
1919
use fmt;
2020
use hash::{Hash, Hasher, self};
2121
use marker::Copy;
22+
#[cfg(stage0)]
2223
use ops::{Deref, FullRange};
24+
#[cfg(not(stage0))]
25+
use ops::Deref;
2326
use option::Option;
2427

2528
// macro for implementing n-ary tuple functions and operations

branches/try/src/libcore/prelude.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
2727
// Reexported core operators
2828
pub use marker::{Copy, Send, Sized, Sync};
29+
#[cfg(stage0)]
2930
pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange};
31+
#[cfg(not(stage0))]
32+
pub use ops::{Drop, Fn, FnMut, FnOnce};
3033

3134
// Reexported functions
3235
pub use iter::range;

0 commit comments

Comments
 (0)