Skip to content

Commit

Permalink
Auto merge of #176 - servo:32, r=emilio
Browse files Browse the repository at this point in the history
Make tests pass on a 32-bit system.

Testable on 64-bit Linux with:

```
rustup target add i686-unknown-linux-gnu
cargo test --target i686-unknown-linux-gnu
```

(or similarly on anther 64-bit platforms), assuming a linker and libc for this target are available on the system.

Leaving #162 open to add CI for this. (Unfortunately Travis doesn’t use rustup out of the box.)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/176)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Oct 25, 2016
2 parents 3a18e14 + 40d8629 commit 7379d87
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/atom/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,8 @@ mod tests {
// Guard against accidental changes to the sizes of things.
assert_eq!(mem::size_of::<super::Atom>(),
if compiler_uses_inline_drop_flags { 16 } else { 8 });
assert_eq!(40, mem::size_of::<super::StringCacheEntry>());
assert_eq!(mem::size_of::<super::StringCacheEntry>(),
8 + 4 * mem::size_of::<usize>());
}

#[test]
Expand Down

0 comments on commit 7379d87

Please sign in to comment.