Skip to content

Commit 692e9c2

Browse files
committed
---
yaml --- r: 13814 b: refs/heads/try c: 4d7c297 h: refs/heads/master v: v3
1 parent 5179d5d commit 692e9c2

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
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 5847cf0367287d89377c57a431f38419ec1db008
5+
refs/heads/try: 4d7c297beaa4326d8c7dda029aeec264616cfca6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/metadata/encoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ fn encode_hash(ebml_w: ebml::writer, hash: str) {
662662
ebml::end_tag(ebml_w);
663663
}
664664

665-
fn encode_metadata(cx: @crate_ctxt, crate: @crate) -> str {
665+
fn encode_metadata(cx: @crate_ctxt, crate: @crate) -> [u8] {
666666

667667
let abbrevs = ty::new_ty_hash();
668668
let ecx = @{ccx: cx, type_abbrevs: abbrevs};
@@ -695,7 +695,7 @@ fn encode_metadata(cx: @crate_ctxt, crate: @crate) -> str {
695695
// Pad this, since something (LLVM, presumably) is cutting off the
696696
// remaining % 4 bytes.
697697
buf_w.write([0u8, 0u8, 0u8, 0u8]);
698-
io::mem_buffer_str(buf)
698+
io::mem_buffer_buf(buf)
699699
}
700700

701701
// Get the encoded string for a type

branches/try/src/comp/middle/trans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5419,7 +5419,7 @@ fn fill_crate_map(ccx: @crate_ctxt, map: ValueRef) {
54195419

54205420
fn write_metadata(cx: @crate_ctxt, crate: @ast::crate) {
54215421
if !cx.sess.building_library { ret; }
5422-
let llmeta = C_postr(metadata::encoder::encode_metadata(cx, crate));
5422+
let llmeta = C_bytes(metadata::encoder::encode_metadata(cx, crate));
54235423
let llconst = trans_common::C_struct([llmeta]);
54245424
let llglobal =
54255425
str::as_buf("rust_metadata",

0 commit comments

Comments
 (0)