Skip to content

Commit 28644af

Browse files
committed
---
yaml --- r: 22360 b: refs/heads/snap-stage3 c: 28c4560 h: refs/heads/master v: v3
1 parent 3366f85 commit 28644af

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0dd4b42a00e01189a28ec12d20a8b144b4e02a14
4+
refs/heads/snap-stage3: 28c45601b299c309d7c9f5b3f53318b9dfc62b34
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/trans/shape.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,16 @@ fn mk_ctxt(llmod: ModuleRef) -> ctxt {
4949
return {mut next_tag_id: 0u16, pad: 0u16, pad2: 0u32};
5050
}
5151

52-
fn add_u16(&dest: ~[u8], val: u16) {
53-
dest += ~[(val & 0xffu16) as u8, (val >> 8u16) as u8];
52+
/*
53+
Although these two functions are never called, they are here
54+
for a VERY GOOD REASON. See #3670
55+
*/
56+
fn add_u16(dest: &mut ~[u8], val: u16) {
57+
*dest += ~[(val & 0xffu16) as u8, (val >> 8u16) as u8];
5458
}
5559

56-
fn add_substr(&dest: ~[u8], src: ~[u8]) {
60+
fn add_substr(dest: &mut ~[u8], src: ~[u8]) {
5761
add_u16(dest, vec::len(src) as u16);
58-
dest += src;
62+
*dest += src;
5963
}
6064

0 commit comments

Comments
 (0)