OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #9066 : thestinger/rust/repr, r=alexcrichton

Browse Source
This commit is contained in:
bors 2013-09-08 22:16:07 -07:00
commit eae327032c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstd/repr.rs
View File

@ -189,8 +189,7 @@ impl<'self> ReprVisitor<'self> {
} else if mtbl == 1 { } else if mtbl == 1 {
// skip, this is ast::m_imm // skip, this is ast::m_imm
} else { } else {
assert_eq!(mtbl, 2); fail!("invalid mutability value");
self.writer.write("const ".as_bytes());
} }
} }
@ -389,6 +388,7 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool { fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool {
do self.get::<raw::Slice<()>> |this, s| { do self.get::<raw::Slice<()>> |this, s| {
this.writer.write(['&' as u8]); this.writer.write(['&' as u8]);
this.write_mut_qualifier(mtbl);
this.write_vec_range(mtbl, s.data, s.len, inner); this.write_vec_range(mtbl, s.data, s.len, inner);
} }
} }
@ -696,6 +696,9 @@ fn test_repr() {
exact_test(&(10u64, ~"hello"), exact_test(&(10u64, ~"hello"),
"(10u64, ~\"hello\")"); "(10u64, ~\"hello\")");
exact_test(&(&[1, 2]), "&[1, 2]");
exact_test(&(&mut [1, 2]), "&mut [1, 2]");
exact_test(&'\'', "'\\''"); exact_test(&'\'', "'\\''");
exact_test(&'"', "'\"'"); exact_test(&'"', "'\"'");
exact_test(&("'"), "\"'\""); exact_test(&("'"), "\"'\"");