Skip to content

Commit d4cef3d

Browse files
committed
---
yaml --- r: 194991 b: refs/heads/beta c: 5bc35b1 h: refs/heads/master i: 194989: 922a1a1 194987: 0539b69 194983: b18fc30 194975: 09b4b4c v: v3
1 parent eb1e612 commit d4cef3d

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 7c671e51770e1e818a57b07bb831f50840049660
34+
refs/heads/beta: 5bc35b1852ea3b7871befeeeec7531107e147278
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: be7f6ac7008f8ddf980ac07026b05bdd865f29cc

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