Bump euclid to 0.13 and heapsize to 0.4

servo · bors-servo · Jun 5, 2017 · May 30, 2017 · Jun 5, 2017 · 0a254b0306508b6f8210735fabf63eb43a3370a0
commit 0a254b0306508b6f8210735fabf63eb43a3370a0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
@@ -13,7 +13,7 @@ path = "lib.rs"
 azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
 cssparser = "0.13.7"
-euclid = "0.11"
+euclid = "0.13"
 gleam = "0.4"
 ipc-channel = "0.7"
 log = "0.3.5"

diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
@@ -11,8 +11,8 @@ path = "lib.rs"
 
 [dependencies]
 cssparser = "0.13.7"
-euclid = "0.11"
-heapsize = "0.3.0"
+euclid = "0.13"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 ipc-channel = "0.7"
 serde = "0.9"

diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
@@ -10,7 +10,7 @@ name = "compositing"
 path = "lib.rs"
 
 [dependencies]
-euclid = "0.11"
+euclid = "0.13"
 gfx_traits = {path = "../gfx_traits"}
 gleam = "0.4"
 image = "0.12"

diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml
@@ -10,7 +10,7 @@ name = "servo_config"
 path = "lib.rs"
 
 [dependencies]
-euclid = "0.11"
+euclid = "0.13"
 getopts = "0.2.11"
 lazy_static = "0.2"
 log = "0.3.5"

diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
@@ -18,7 +18,7 @@ canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
 debugger = {path = "../debugger"}
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.11"
+euclid = "0.13"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 hyper = "0.10"

diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
 hyper_serde = "0.6"

diff --git a/components/geometry/Cargo.toml b/components/geometry/Cargo.toml
@@ -15,5 +15,5 @@ servo = ["euclid/unstable"]
 
 [dependencies]
 app_units = "0.4.1"
-euclid = "0.11"
-heapsize = "0.3.0"
+euclid = "0.13"
+heapsize = "0.4"
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -13,12 +13,12 @@ path = "lib.rs"
 [dependencies]
 app_units = "0.4.1"
 bitflags = "0.7"
-euclid = "0.11"
+euclid = "0.13"
 fnv = "1.0"
 fontsan = {git = "https://github.com/servo/fontsan"}
 gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 ipc-channel = "0.7"
 lazy_static = "0.2"
@@ -33,7 +33,7 @@ serde_derive = "0.9"
 servo_atoms = {path = "../atoms"}
 servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
-smallvec = "0.3"
+smallvec = "0.4"
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 time = "0.1.12"

diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml
@@ -10,7 +10,7 @@ name = "gfx_traits"
 path = "lib.rs"
 
 [dependencies]
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 range = {path = "../range"}
 serde = "0.9"

diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -15,11 +15,11 @@ atomic_refcell = "0.1"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = "0.13.7"
-euclid = "0.11"
+euclid = "0.13"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-heapsize = "0.3.0"
+heapsize = "0.4"
 html5ever = "0.17"
 ipc-channel = "0.7"
 libc = "0.2"
@@ -40,7 +40,7 @@ servo_geometry = {path = "../geometry"}
 serde_json = "0.9"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
-smallvec = "0.3"
+smallvec = "0.4"
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 unicode-bidi = {version = "0.3", features = ["with_serde"]}

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
@@ -11,11 +11,11 @@ path = "lib.rs"
 
 [dependencies]
 app_units = "0.4.1"
-euclid = "0.11"
+euclid = "0.13"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-heapsize = "0.3.0"
+heapsize = "0.4"
 ipc-channel = "0.7"
 layout = {path = "../layout"}
 layout_traits = {path = "../layout_traits"}

diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
@@ -11,7 +11,8 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
-heapsize = "0.3.0"
+cssparser = "0.13.3"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 serde = "0.9"
 serde_derive = "0.9"

diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 cookie = "0.6"
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
 hyper_serde = "0.6"

diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml
@@ -11,7 +11,7 @@ name = "range"
 path = "lib.rs"
 
 [dependencies]
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 num-traits = "0.1.32"
 serde = "0.9"

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -41,12 +41,12 @@ devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}
 domobject_derive = {path = "../domobject_derive"}
 encoding = "0.2"
-euclid = "0.11"
+euclid = "0.13"
 fnv = "1.0"
 gleam = "0.4"
 gfx_traits = {path = "../gfx_traits"}
 half = "1.0"
-heapsize = "0.3.6"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 html5ever = {version = "0.17", features = ["heap_size", "unstable"]}
 hyper = "0.10"
@@ -82,7 +82,7 @@ servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry" }
 servo_rand = {path = "../rand"}
 servo_url = {path = "../url"}
-smallvec = "0.3"
+smallvec = "0.4"
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 swapper = "0.0.4"

diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
@@ -14,9 +14,9 @@ app_units = "0.4.1"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = "0.13.7"
-euclid = "0.11"
+euclid = "0.13"
 gfx_traits = {path = "../gfx_traits"}
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 html5ever = "0.17"
 ipc-channel = "0.7"

diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
@@ -14,9 +14,9 @@ bluetooth_traits = {path = "../bluetooth_traits"}
 canvas_traits = {path = "../canvas_traits"}
 cookie = "0.6"
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.11"
+euclid = "0.13"
 gfx_traits = {path = "../gfx_traits"}
-heapsize = "0.3.0"
+heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
 hyper_serde = "0.6"

diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
@@ -28,7 +28,7 @@ cssparser = "0.13.7"
 fnv = "1.0"
 phf = "0.7.18"
 precomputed-hash = "0.1"
-smallvec = "0.3"
+smallvec = "0.4"
 
 [dev-dependencies]
 size_of_test = {path = "../size_of_test"}

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -30,7 +30,7 @@ debugger = {path = "../debugger"}
 devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
 env_logger = "0.4"
-euclid = "0.11"
+euclid = "0.13"
 gfx = {path = "../gfx"}
 gleam = "0.4"
 ipc-channel = "0.7"

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -40,9 +40,9 @@ byteorder = "1.0"
 cfg-if = "0.1.0"
 cssparser = "0.13.7"
 encoding = {version = "0.2", optional = true}
-euclid = "0.11"
+euclid = "0.13"
 fnv = "1.0"
-heapsize = {version = "0.3.0", optional = true}
+heapsize = {version = "0.4", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 itoa = "0.3"
 html5ever = {version = "0.17", optional = true}
@@ -63,7 +63,7 @@ serde = {version = "0.9", optional = true}
 serde_derive = {version = "0.9", optional = true}
 servo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
-smallvec = "0.3.3"
+smallvec = "0.4"
 style_derive = {path = "../style_derive"}
 style_traits = {path = "../style_traits"}
 servo_url = {path = "../url", optional = true}

diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
@@ -17,8 +17,8 @@ gecko = []
 [dependencies]
 app_units = "0.4.1"
 cssparser = "0.13.7"
-euclid = "0.11"
-heapsize = {version = "0.3.0", optional = true}
+euclid = "0.13"
+heapsize = {version = "0.4", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 serde = {version = "0.9", optional = true}
 serde_derive = {version = "0.9", optional = true}
diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml
@@ -10,7 +10,7 @@ name = "servo_url"
 path = "lib.rs"
 
 [dependencies]
-heapsize = {version = "0.3.0"}
+heapsize = {version = "0.4"}
 heapsize_derive = {version = "0.1"}
 serde = {version = "0.9"}
 serde_derive = {version = "0.9"}

diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 base64 = "0.5.2"
 cookie = "0.6"
-euclid = "0.11"
+euclid = "0.13"
 hyper = "0.10"
 image = "0.12"
 ipc-channel = "0.7"

diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
@@ -20,7 +20,7 @@ debugmozjs = ["libservo/debugmozjs"]
 [dependencies]
 compositing = {path = "../../components/compositing"}
 devtools = {path = "../../components/devtools"}
-euclid = "0.11"
+euclid = "0.13"
 gleam = "0.4"
 glutin_app = {path = "../glutin"}
 libc = "0.2"

diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 compositing = {path = "../../components/compositing"}
-euclid = "0.11"
+euclid = "0.13"
 gleam = "0.4"
 log = "0.3.5"
 msg = {path = "../../components/msg"}

diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
@@ -222,7 +222,7 @@ impl Window {
                parent: Option<glutin::WindowID>) -> Rc<Window> {
         let win_size: TypedSize2D<u32, DevicePixel> =
             (window_size.to_f32() * window_creation_scale_factor())
-                .to_uint().cast().expect("Window size should fit in u32");
+                .to_usize().cast().expect("Window size should fit in u32");
         let width = win_size.to_untyped().width;
         let height = win_size.to_untyped().height;
 

diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
 doctest = false
 
 [dependencies]
-euclid = "0.11"
+euclid = "0.13"
 msg = {path = "../../../components/msg"}
 script = {path = "../../../components/script"}
 servo_url = {path = "../../../components/url"}
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
@@ -16,7 +16,7 @@ testing = ["style/testing"]
 byteorder = "1.0"
 app_units = "0.4.1"
 cssparser = "0.13.7"
-euclid = "0.11"
+euclid = "0.13"
 html5ever = "0.17"
 parking_lot = "0.3"
 rayon = "0.7"

diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
@@ -18,7 +18,7 @@ testing = ["style/testing"]
 atomic_refcell = "0.1"
 cssparser = "0.13.7"
 env_logger = "0.4"
-euclid = "0.11"
+euclid = "0.13"
 geckoservo = {path = "../../../ports/geckolib"}
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}