Skip to content

Commit

Permalink
Fix #8898
Browse files Browse the repository at this point in the history
  • Loading branch information
novalis committed Sep 2, 2013
1 parent 73a28e5 commit c4bb883
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/libstd/repr.rs
Expand Up @@ -381,10 +381,11 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
}
}

fn visit_evec_fixed(&mut self, _n: uint, sz: uint, _align: uint,
fn visit_evec_fixed(&mut self, n: uint, sz: uint, _align: uint,
mtbl: uint, inner: *TyDesc) -> bool {
let assumed_size = if sz == 0 { n } else { sz };
do self.get::<()> |this, b| {
this.write_vec_range(mtbl, ptr::to_unsafe_ptr(b), sz, inner);
this.write_vec_range(mtbl, ptr::to_unsafe_ptr(b), assumed_size, inner);
}
}

Expand Down
32 changes: 32 additions & 0 deletions src/test/run-pass/issue-8898.rs
@@ -0,0 +1,32 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.


fn assert_repr_eq<T>(obj : T, expected : ~str) {

assert_eq!(expected, fmt!("%?", obj));
}

pub fn main() {
let abc = [1, 2, 3];
let tf = [true, false];
let x = [(), ()];
let y = ~[(), ()];
let slice = x.slice(0,1);
let z = @x;

assert_repr_eq(abc, ~"[1, 2, 3]");
assert_repr_eq(tf, ~"[true, false]");
assert_repr_eq(x, ~"[(), ()]");
assert_repr_eq(y, ~"~[(), ()]");
assert_repr_eq(slice, ~"&[()]");
assert_repr_eq(&x, ~"&[(), ()]");
assert_repr_eq(z, ~"@[(), ()]");
}

5 comments on commit c4bb883

@bors
Copy link
Contributor

@bors bors commented on c4bb883 Sep 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from thestinger
at novalis@c4bb883

@bors
Copy link
Contributor

@bors bors commented on c4bb883 Sep 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging novalis/rust/fix-8898 = c4bb883 into auto

@bors
Copy link
Contributor

@bors bors commented on c4bb883 Sep 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

novalis/rust/fix-8898 = c4bb883 merged ok, testing candidate = 8f678ae

@bors
Copy link
Contributor

@bors bors commented on c4bb883 Sep 2, 2013

@bors
Copy link
Contributor

@bors bors commented on c4bb883 Sep 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8f678ae

Please sign in to comment.