Skip to content

Commit a5891be

Browse files
committed
auto merge of #6265 : sanxiyn/rust/xc-packed, r=nikomatsakis
2 parents b6dea9d + 502817a commit a5891be

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

Diff for: src/librustc/metadata/encoder.rs

+1
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ fn encode_info_for_item(ecx: @EncodeContext,
819819
}
820820
821821
encode_name(ecx, ebml_w, item.ident);
822+
encode_attributes(ebml_w, item.attrs);
822823
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
823824
encode_region_param(ecx, ebml_w, item);
824825

Diff for: src/test/auxiliary/packed.rs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#[packed]
2+
struct S {
3+
a: u8,
4+
b: u32
5+
}

Diff for: src/test/run-pass/packed-struct-size-xc.rs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// xfail-fast
2+
// aux-build:packed.rs
3+
4+
extern mod packed;
5+
6+
fn main() {
7+
assert_eq!(sys::size_of::<packed::S>(), 5);
8+
}

0 commit comments

Comments
 (0)