mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6688 : graydon/rust/issue-3396-mystery-bug-in-metadata, r=Aatch

Browse Source 
Whatever it was, it is no longer a problem here.
This commit is contained in:
bors 2013-05-27 04:38:04 -07:00
commit d577eafff3
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc/metadata/encoder.rs
View File

@ -1470,19 +1470,10 @@ pub fn encode_metadata(parms: EncodeParams, crate: &crate) -> ~[u8] {
// remaining % 4 bytes.
wr.write(&[0u8, 0u8, 0u8, 0u8]);
// FIXME #3396: weird bug here, for reasons unclear this emits random
// looking bytes (mostly 0x1) if we use the version byte-array constant
// above; so we use a string constant inline instead.
//
// Should be:
//
// vec::to_owned(metadata_encoding_version) +
let writer_bytes: &mut ~[u8] = wr.bytes;
(do str::as_bytes(&~"rust\x00\x00\x00\x01") |bytes| {
vec::slice(*bytes, 0, 8).to_vec()
}) + flate::deflate_bytes(*writer_bytes)
vec::to_owned(metadata_encoding_version) +
flate::deflate_bytes(*writer_bytes)
}
// Get the encoded string for a type