Skip to content

Commit f89d4ac

Browse files
committed
Merge pull request #4081 from graydon/iterbytes-and-workcache
libs: Remove transitionary material on iter_bytes, add workcache to buil...
2 parents 946427b + d783f4d commit f89d4ac

File tree

13 files changed

+1
-885
lines changed

13 files changed

+1
-885
lines changed

src/libcore/to_bytes.rs

-335
Large diffs are not rendered by default.

src/librustc/middle/borrowck/mod.rs

-8
Original file line numberDiff line numberDiff line change
@@ -424,14 +424,6 @@ impl root_map_key : cmp::Eq {
424424
}
425425
}
426426

427-
#[cfg(stage0)]
428-
impl root_map_key : to_bytes::IterBytes {
429-
pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
430-
to_bytes::iter_bytes_2(&self.id, &self.derefs, lsb0, f);
431-
}
432-
}
433-
#[cfg(stage1)]
434-
#[cfg(stage2)]
435427
impl root_map_key : to_bytes::IterBytes {
436428
pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
437429
to_bytes::iter_bytes_2(&self.id, &self.derefs, lsb0, f);

src/librustc/middle/trans/common.rs

-24
Original file line numberDiff line numberDiff line change
@@ -1170,22 +1170,6 @@ impl mono_id_ : cmp::Eq {
11701170
pure fn ne(&self, other: &mono_id_) -> bool { !(*self).eq(other) }
11711171
}
11721172
1173-
#[cfg(stage0)]
1174-
impl mono_param_id : to_bytes::IterBytes {
1175-
pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
1176-
match self {
1177-
mono_precise(t, mids) =>
1178-
to_bytes::iter_bytes_3(&0u8, &ty::type_id(t), &mids, lsb0, f),
1179-
1180-
mono_any => 1u8.iter_bytes(lsb0, f),
1181-
1182-
mono_repr(ref a, ref b, ref c, ref d) =>
1183-
to_bytes::iter_bytes_5(&2u8, a, b, c, d, lsb0, f)
1184-
}
1185-
}
1186-
}
1187-
#[cfg(stage1)]
1188-
#[cfg(stage2)]
11891173
impl mono_param_id : to_bytes::IterBytes {
11901174
pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
11911175
match *self {
@@ -1200,14 +1184,6 @@ impl mono_param_id : to_bytes::IterBytes {
12001184
}
12011185
}
12021186
1203-
#[cfg(stage0)]
1204-
impl mono_id_ : core::to_bytes::IterBytes {
1205-
pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
1206-
to_bytes::iter_bytes_2(&self.def, &self.params, lsb0, f);
1207-
}
1208-
}
1209-
#[cfg(stage1)]
1210-
#[cfg(stage2)]
12111187
impl mono_id_ : core::to_bytes::IterBytes {
12121188
pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
12131189
to_bytes::iter_bytes_2(&self.def, &self.params, lsb0, f);

src/librustc/middle/trans/datum.rs

-8
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@ impl DatumMode: cmp::Eq {
145145
pure fn ne(&self, other: &DatumMode) -> bool { !(*self).eq(other) }
146146
}
147147

148-
#[cfg(stage0)]
149-
impl DatumMode: to_bytes::IterBytes {
150-
pure fn iter_bytes(+lsb0: bool, f: to_bytes::Cb) {
151-
(self as uint).iter_bytes(lsb0, f)
152-
}
153-
}
154-
#[cfg(stage1)]
155-
#[cfg(stage2)]
156148
impl DatumMode: to_bytes::IterBytes {
157149
pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
158150
(*self as uint).iter_bytes(lsb0, f)

0 commit comments

Comments
 (0)