Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6850 - servo:rustup_2015-07-30, r=SimonSapin

Browse source 
Upgrade to rustc 1.3.0-dev (87055a68c 2015-07-30)

This builds and passes unit tests.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6850)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-30 14:46:13 -06:00
commit 4837dd9a1c
23 changed files with 211 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/unit/util/mem.rs
View file

@ -64,9 +64,12 @@ fn test_heap_size() {
assert_eq!(x.heap_size_of_children(), 8);
// An ascii string with 16 chars is 16 bytes in UTF-8.
assert_eq!(String::from("0123456789abcdef").heap_size_of_children(), 16);
// … but RawVec::reserve gives twice the requested capacity.
let mut x = String::new();
x.push_str("0123456789abcdef");
assert_eq!(x.heap_size_of_children(), 16);
assert_eq!(x.heap_size_of_children(), 32);
// Not on the heap.
let x: Option<i32> = None;