Update euclid to 0.18

servo · Jul 18, 2018 · 9e44697 · 9e44697
1 parent 8866491
commit 9e44697
Show file tree

Hide file tree

Showing 27 changed files with 78 additions and 82 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
@@ -14,13 +14,13 @@ azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
 cssparser = "0.24"
-euclid = "0.17"
+euclid = "0.18"
 fnv = "1.0"
 gleam = "0.5"
 ipc-channel = "0.10"
 log = "0.4"
 num-traits = "0.1.32"
-offscreen_gl_context = {version = "0.18", features = ["serde", "osmesa"]}
+offscreen_gl_context = {version = "0.19", features = ["serde", "osmesa"]}
 serde_bytes = "0.10"
 servo_config = {path = "../config"}
 webrender = {git = "https://github.com/servo/webrender"}

diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
@@ -585,7 +585,7 @@ impl<'a> CanvasData<'a> {
                                                                                   source_rect.size.height as i32),
                                                                      self.drawtarget.get_format());
         let matrix = Transform2D::identity()
-            .pre_translate(-source_rect.origin.to_vector().cast().unwrap())
+            .pre_translate(-source_rect.origin.to_vector().cast())
             .pre_mul(&self.state.transform);
         draw_target.set_transform(&matrix);
         draw_target

diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
@@ -11,13 +11,13 @@ path = "lib.rs"
 
 [dependencies]
 cssparser = "0.24.0"
-euclid = "0.17"
+euclid = "0.18"
 ipc-channel = "0.10"
 gleam = "0.5.1"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
-offscreen_gl_context = {version = "0.18", features = ["serde"]}
+offscreen_gl_context = {version = "0.19", features = ["serde"]}
 serde = "1.0"
 serde_bytes = "0.10"
 servo_config = {path = "../config"}

diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
@@ -15,7 +15,7 @@ default = []
 
 [dependencies]
 embedder_traits = {path = "../embedder_traits"}
-euclid = "0.17"
+euclid = "0.18"
 gfx_traits = {path = "../gfx_traits"}
 gleam = {version = "0.5", optional = true}
 image = "0.19"

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
@@ -771,15 +771,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
     fn on_touch_move(&mut self, identifier: TouchId, point: DevicePoint) {
         match self.touch_handler.on_touch_move(identifier, point) {
             TouchAction::Scroll(delta) => {
-                match point.cast() {
-                    Some(point) => self.on_scroll_window_event(
-                        ScrollLocation::Delta(
-                            LayoutVector2D::from_untyped(&delta.to_untyped())
-                        ),
-                        point
+                self.on_scroll_window_event(
+                    ScrollLocation::Delta(
+                        LayoutVector2D::from_untyped(&delta.to_untyped())
                     ),
-                    None => error!("Point cast failed."),
-                }
+                    point.cast()
+                )
             }
             TouchAction::Zoom(magnification, scroll_delta) => {
                 let cursor = TypedPoint2D::new(-1, -1);  // Make sure this hits the base layer.

diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml
@@ -12,7 +12,7 @@ test = false
 doctest = false
 
 [dependencies]
-euclid = "0.17"
+euclid = "0.18"
 embedder_traits = { path = "../embedder_traits" }
 getopts = "0.2.11"
 lazy_static = "1"

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.17"
+euclid = "0.18"
 embedder_traits = { path = "../embedder_traits" }
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}

diff --git a/components/geometry/Cargo.toml b/components/geometry/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 app_units = "0.6"
-euclid = "0.17"
+euclid = "0.18"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
 style_traits = { path = "../style_traits" }

diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -18,7 +18,7 @@ unstable = []
 [dependencies]
 app_units = "0.6"
 bitflags = "1.0"
-euclid = "0.17"
+euclid = "0.18"
 fnv = "1.0"
 fontsan = {git = "https://github.com/servo/fontsan"}
 gfx_traits = {path = "../gfx_traits"}

diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -16,7 +16,7 @@ app_units = "0.6.1"
 atomic_refcell = "0.1"
 bitflags = "1.0"
 canvas_traits = {path = "../canvas_traits"}
-euclid = "0.17"
+euclid = "0.18"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}

diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
@@ -2370,7 +2370,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
                         clip.size.height.to_f32_px(),
                     );
 
-                    let clip = transform.transform_rect(&clip);
+                    let clip = transform.transform_rect(&clip).unwrap();
 
                     rect(
                         Au::from_f32_px(clip.origin.x),

diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
@@ -99,7 +99,7 @@ pub fn iterate_through_flow_tree_fragment_border_boxes(root: &mut Flow, iterator
                 if let Some(matrix) = kid.as_block()
                        .fragment
                        .transform_matrix(&relative_position) {
-                    let transform_matrix = matrix.transform_point2d(&LayoutPoint::zero());
+                    let transform_matrix = matrix.transform_point2d(&LayoutPoint::zero()).unwrap();
                     stacking_context_position = stacking_context_position +
                                                 Vector2D::new(Au::from_f32_px(transform_matrix.x),
                                                               Au::from_f32_px(transform_matrix.y))

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
@@ -16,7 +16,7 @@ unstable = ["parking_lot/nightly"]
 app_units = "0.6"
 atomic_refcell = "0.1"
 embedder_traits = {path = "../embedder_traits"}
-euclid = "0.17"
+euclid = "0.18"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}

diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
@@ -25,7 +25,7 @@ servo = [
 [dependencies]
 app_units = "0.6"
 cssparser = "0.24.0"
-euclid = "0.17"
+euclid = "0.18"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.10", optional = true }
 hyper_serde = { version = "0.8", optional = true }

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -45,7 +45,7 @@ domobject_derive = {path = "../domobject_derive"}
 embedder_traits = {path = "../embedder_traits"}
 encoding_rs = "0.7"
 enum-iterator = "0.2.0"
-euclid = "0.17"
+euclid = "0.18"
 fnv = "1.0"
 gleam = "0.5"
 half = "1.0"
@@ -69,7 +69,7 @@ mozjs = { version = "0.7.1", features = ["promises"]}
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.1.32"
-offscreen_gl_context = {version = "0.18", features = ["serde"]}
+offscreen_gl_context = {version = "0.19", features = ["serde"]}
 parking_lot = "0.5"
 phf = "0.7.18"
 profile_traits = {path = "../profile_traits"}

diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
@@ -14,7 +14,7 @@ app_units = "0.6"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = "0.24"
-euclid = "0.17"
+euclid = "0.18"
 gfx_traits = {path = "../gfx_traits"}
 html5ever = "0.22"
 ipc-channel = "0.10"

diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
@@ -15,7 +15,7 @@ canvas_traits = {path = "../canvas_traits"}
 cookie = "0.10"
 devtools_traits = {path = "../devtools_traits"}
 embedder_traits = {path = "../embedder_traits"}
-euclid = "0.17"
+euclid = "0.18"
 gfx_traits = {path = "../gfx_traits"}
 hyper = "0.10"
 hyper_serde = "0.8"

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -37,7 +37,7 @@ devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
 embedder_traits = {path = "../embedder_traits"}
 env_logger = "0.5"
-euclid = "0.17"
+euclid = "0.18"
 gfx = {path = "../gfx"}
 gleam = "0.5"
 ipc-channel = "0.10"

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -34,7 +34,7 @@ cfg-if = "0.1.0"
 cssparser = "0.24.0"
 new_debug_unreachable = "1.0"
 encoding_rs = {version = "0.7", optional = true}
-euclid = "0.17"
+euclid = "0.18"
 fallible = { path = "../fallible" }
 fnv = "1.0"
 hashglobe = { path = "../hashglobe" }

diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs
@@ -436,7 +436,6 @@ where
             Perspective(ref d) => {
                 let m = create_perspective_matrix(d.to_pixel_length(None)?);
                 m.cast()
-                    .expect("Casting from f32 to f64 should be successful")
             },
             Scale3D(sx, sy, sz) => Transform3D::create_scale(sx.into(), sy.into(), sz.into()),
             Scale(sx, sy) => Transform3D::create_scale(sx.into(), sy.unwrap_or(sx).into(), 1.),

diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
@@ -17,7 +17,7 @@ gecko = []
 app_units = "0.6"
 cssparser = "0.24.0"
 bitflags = "1.0"
-euclid = "0.17"
+euclid = "0.18"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
 selectors = { path = "../selectors" }

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

diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml
@@ -15,7 +15,7 @@ oculusvr = ['rust-webvr/oculusvr']
 
 [dependencies]
 canvas_traits = {path = "../canvas_traits"}
-euclid = "0.17"
+euclid = "0.18"
 ipc-channel = "0.10"
 log = "0.4"
 msg = {path = "../msg"}

diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
@@ -36,7 +36,7 @@ unstable = ["libservo/unstable"]
 [dependencies]
 backtrace = "0.3"
 bitflags = "1.0"
-euclid = "0.17"
+euclid = "0.18"
 gleam = "0.5"
 glutin = "0.17"
 lazy_static = "1"

diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml
@@ -9,7 +9,7 @@ name = "script_tests"
 path = "lib.rs"
 
 [dependencies]
-euclid = "0.17"
+euclid = "0.18"
 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
@@ -13,7 +13,7 @@ doctest = false
 byteorder = "1.0"
 app_units = "0.6"
 cssparser = "0.24.0"
-euclid = "0.17"
+euclid = "0.18"
 html5ever = "0.22"
 parking_lot = "0.5"
 rayon = "1"