---

catamorphism · catamorphism · commit c73e2260d221 · 2012-10-05T19:24:04.000-07:00
yaml --- r: 31068 b: refs/heads/incoming c: 28c4560 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0dd4b42a00e01189a28ec12d20a8b144b4e02a14
+refs/heads/incoming: 28c45601b299c309d7c9f5b3f53318b9dfc62b34
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rustc/middle/trans/shape.rs b/branches/incoming/src/rustc/middle/trans/shape.rs
@@ -49,12 +49,16 @@ fn mk_ctxt(llmod: ModuleRef) -> ctxt {
     return {mut next_tag_id: 0u16, pad: 0u16, pad2: 0u32};
 }
 
-fn add_u16(&dest: ~[u8], val: u16) {
-    dest += ~[(val & 0xffu16) as u8, (val >> 8u16) as u8];
+/*
+Although these two functions are never called, they are here
+for a VERY GOOD REASON. See #3670
+*/
+fn add_u16(dest: &mut ~[u8], val: u16) {
+    *dest += ~[(val & 0xffu16) as u8, (val >> 8u16) as u8];
 }
 
-fn add_substr(&dest: ~[u8], src: ~[u8]) {
+fn add_substr(dest: &mut ~[u8], src: ~[u8]) {
     add_u16(dest, vec::len(src) as u16);
-    dest += src;
+    *dest += src;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,16 @@ fn mk_ctxt(llmod: ModuleRef) -> ctxt {`
`49`	`49`	`return {mut next_tag_id: 0u16, pad: 0u16, pad2: 0u32};`
`50`	`50`	`}`
`51`	`51`
`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];`
`54`	`58`	`}`
`55`	`59`
`56`		`-fn add_substr(&dest: ~[u8], src: ~[u8]) {`
	`60`	`+fn add_substr(dest: &mut ~[u8], src: ~[u8]) {`
`57`	`61`	`add_u16(dest, vec::len(src) as u16);`
`58`		`- dest += src;`
	`62`	`+ *dest += src;`
`59`	`63`	`}`
`60`	`64`