Skip to content

Commit b946564

Browse files
committed
---
yaml --- r: 194475 b: refs/heads/auto c: 5bc35b1 h: refs/heads/master i: 194473: 76bc81f 194471: 2111ed4 v: v3
1 parent aed3354 commit b946564

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-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: 7c671e51770e1e818a57b07bb831f50840049660
13+
refs/heads/auto: 5bc35b1852ea3b7871befeeeec7531107e147278
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ macro_rules! repeat_u8_as_u64 {
334334
// But having the sign bit set is a pain, so 0x1d is probably better.
335335
//
336336
// And of course, 0x00 brings back the old world of zero'ing on drop.
337-
#[cfg(not(stage0))] pub const POST_DROP_U8: u8 = 0x0;
337+
#[cfg(not(stage0))] pub const POST_DROP_U8: u8 = 0x1d;
338338
#[cfg(not(stage0))] pub const POST_DROP_U32: u32 = repeat_u8_as_u32!(POST_DROP_U8);
339339
#[cfg(not(stage0))] pub const POST_DROP_U64: u64 = repeat_u8_as_u64!(POST_DROP_U8);
340340

branches/auto/src/librustc_trans/trans/adt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ macro_rules! repeat_u8_as_u64 {
166166
(repeat_u8_as_u32!($name) as u64)) }
167167
}
168168

169-
pub const DTOR_NEEDED: u8 = 0x1;
169+
pub const DTOR_NEEDED: u8 = 0xd4;
170170
pub const DTOR_NEEDED_U32: u32 = repeat_u8_as_u32!(DTOR_NEEDED);
171171
pub const DTOR_NEEDED_U64: u64 = repeat_u8_as_u64!(DTOR_NEEDED);
172172
#[allow(dead_code)]
@@ -178,7 +178,7 @@ pub fn dtor_needed_usize(ccx: &CrateContext) -> usize {
178178
}
179179
}
180180

181-
pub const DTOR_DONE: u8 = 0x0;
181+
pub const DTOR_DONE: u8 = 0x1d;
182182
pub const DTOR_DONE_U32: u32 = repeat_u8_as_u32!(DTOR_DONE);
183183
pub const DTOR_DONE_U64: u64 = repeat_u8_as_u64!(DTOR_DONE);
184184
#[allow(dead_code)]

0 commit comments

Comments
 (0)