auto merge of #6053 : nikomatsakis/rust/fixme-2699, r=thestinger

bors · bors · commit 533425e242db · 2013-06-06T13:52:41.000-07:00
r? @jld or @graydon The calculation looks right to me, but perhaps one of you two can double check. You two seem like you are doing the most recent work in this sort of area.
diff --git a/src/rt/rust_util.h b/src/rt/rust_util.h
@@ -81,7 +81,6 @@ typedef rust_vec_box rust_str;
 
 inline size_t get_box_size(size_t body_size, size_t body_align) {
     size_t header_size = sizeof(rust_opaque_box);
-    // FIXME (#2699): This alignment calculation is suspicious. Is it right?
     size_t total_size = align_to(header_size, body_align) + body_size;
     return total_size;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ typedef rust_vec_box rust_str;`
`81`	`81`
`82`	`82`	`inline size_t get_box_size(size_t body_size, size_t body_align) {`
`83`	`83`	`size_t header_size = sizeof(rust_opaque_box);`
`84`		`- // FIXME (#2699): This alignment calculation is suspicious. Is it right?`
`85`	`84`	`size_t total_size = align_to(header_size, body_align) + body_size;`
`86`	`85`	`return total_size;`
`87`	`86`	`}`