Skip to content

Commit 2104ec0

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 190925 b: refs/heads/auto c: 3ff84fc h: refs/heads/master i: 190923: 8d1fc5c v: v3
1 parent 6b3eaac commit 2104ec0

File tree

10 files changed

+1005
-4
lines changed

10 files changed

+1005
-4
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: 8afcaabee32fb41eaf065041d7510c6762f12822
13+
refs/heads/auto: 3ff84fc5fdd9509fc3ee4595fd76aa31d4815b2a
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libarena/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ use std::intrinsics::{TyDesc, get_tydesc};
4646
use std::intrinsics;
4747
use std::marker;
4848
use std::mem;
49+
#[cfg(stage0)]
4950
use std::num::{Int, UnsignedInt};
5051
use std::ptr;
5152
use std::rc::Rc;

branches/auto/src/libcollections/btree/node.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use core::iter::Zip;
2323
use core::marker::PhantomData;
2424
use core::ops::{Deref, DerefMut, Index, IndexMut};
2525
use core::ptr::Unique;
26-
use core::{slice, mem, ptr, cmp, num, raw};
26+
use core::{slice, mem, ptr, cmp, raw};
2727
use alloc::heap::{self, EMPTY};
2828

2929
use borrow::Borrow;
@@ -105,7 +105,10 @@ struct MutNodeSlice<'a, K: 'a, V: 'a> {
105105
/// Fails if `target_alignment` is not a power of two.
106106
#[inline]
107107
fn round_up_to_next(unrounded: usize, target_alignment: usize) -> usize {
108-
assert!(num::UnsignedInt::is_power_of_two(target_alignment));
108+
#[cfg(stage0)]
109+
use core::num::UnsignedInt;
110+
111+
assert!(target_alignment.is_power_of_two());
109112
(unrounded + target_alignment - 1) & !(target_alignment - 1)
110113
}
111114

branches/auto/src/libcollections/vec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ use core::intrinsics::assume;
5959
use core::iter::{repeat, FromIterator, IntoIterator};
6060
use core::marker::PhantomData;
6161
use core::mem;
62+
#[cfg(stage0)]
6263
use core::num::{Int, UnsignedInt};
6364
use core::ops::{Index, IndexMut, Deref, Add};
6465
use core::ops;

branches/auto/src/libcollections/vec_deque.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use core::default::Default;
2525
use core::fmt;
2626
use core::iter::{self, repeat, FromIterator, IntoIterator, RandomAccessIterator};
2727
use core::mem;
28+
#[cfg(stage0)]
2829
use core::num::{Int, UnsignedInt};
2930
use core::num::wrapping::WrappingOps;
3031
use core::ops::{Index, IndexMut};

0 commit comments

Comments
 (0)