Use euclid from crates.io

components/script/Cargo.toml

@@ -48,9 +48,6 @@ path = "../canvas_traits"
 [dependencies.selectors]
 git = "https://github.com/servo/rust-selectors"
 
-[dependencies.geom]
-git = "https://github.com/servo/rust-geom"
-
 [dependencies.js]
 git = "https://github.com/servo/rust-mozjs"
 
@@ -82,3 +79,4 @@ smallvec = "0.1"
 html5ever = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
+euclid = "0.1"

components/script/dom/bindings/trace.rs

@@ -38,9 +38,9 @@ use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle
 use canvas_traits::{LineCapStyle, LineJoinStyle, CompositionOrBlending, RepetitionStyle};
 use cssparser::RGBA;
 use encoding::types::EncodingRef;
-use geom::matrix2d::Matrix2D;
-use geom::rect::Rect;
-use geom::size::Size2D;
+use euclid::matrix2d::Matrix2D;
+use euclid::rect::Rect;
+use euclid::size::Size2D;
 use html5ever::tree_builder::QuirksMode;
 use hyper::header::Headers;
 use hyper::method::Method;

components/script/dom/canvaspattern.rs

@@ -8,7 +8,7 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::canvasgradient::ToFillOrStrokeStyle;
-use geom::size::Size2D;
+use euclid::size::Size2D;
 
 // https://html.spec.whatwg.org/multipage/#canvaspattern
 #[dom_struct]

components/script/dom/canvasrenderingcontext2d.rs

@@ -24,10 +24,10 @@ use dom::node::{window_from_node, NodeHelpers, NodeDamage};
 
 use cssparser::Color as CSSColor;
 use cssparser::{Parser, RGBA};
-use geom::matrix2d::Matrix2D;
-use geom::point::Point2D;
-use geom::rect::Rect;
-use geom::size::Size2D;
+use euclid::matrix2d::Matrix2D;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
+use euclid::size::Size2D;
 
 use canvas_traits::{CanvasMsg, Canvas2dMsg, CanvasCommonMsg};
 use canvas_traits::{FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle, RepetitionStyle};

components/script/dom/document.rs

@@ -82,7 +82,7 @@ use util::opts;
 use util::str::{DOMString, split_html_space_chars};
 use layout_interface::{ReflowGoal, ReflowQueryType};
 
-use geom::point::Point2D;
+use euclid::point::Point2D;
 use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks};
 use layout_interface::{LayoutChan, Msg};
 use string_cache::{Atom, QualName};

components/script/dom/htmlcanvaselement.rs

@@ -31,7 +31,7 @@ use js::jsapi::{JSContext};
 use js::jsval::JSVal;
 use offscreen_gl_context::GLContextAttributes;
 
-use geom::size::Size2D;
+use euclid::size::Size2D;
 
 use std::cell::Cell;
 use std::default::Default;

components/script/dom/imagedata.rs

@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::ImageDataBinding::ImageDataMethods;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use geom::size::Size2D;
+use euclid::size::Size2D;
 use js::jsapi::{JSContext, JSObject};
 use js::jsfriendapi::bindgen::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData};
 use libc::uint8_t;

components/script/dom/node.rs

@@ -46,7 +46,7 @@ use dom::processinginstruction::{ProcessingInstruction, ProcessingInstructionHel
 use dom::text::Text;
 use dom::virtualmethods::{VirtualMethods, vtable_for};
 use dom::window::{Window, WindowHelpers};
-use geom::rect::Rect;
+use euclid::rect::Rect;
 use layout_interface::{LayoutChan, Msg};
 use devtools_traits::NodeInfo;
 use parse::html::parse_html_fragment;

components/script/dom/webglrenderingcontext.rs

@@ -19,7 +19,7 @@ use dom::webgltexture::{WebGLTexture, WebGLTextureHelpers};
 use dom::webglshader::{WebGLShader, WebGLShaderHelpers};
 use dom::webglprogram::{WebGLProgram, WebGLProgramHelpers};
 use dom::webgluniformlocation::{WebGLUniformLocation, WebGLUniformLocationHelpers};
-use geom::size::Size2D;
+use euclid::size::Size2D;
 use js::jsapi::{JSContext, JSObject};
 use js::jsfriendapi::bindgen::{JS_GetFloat32ArrayData, JS_GetObjectAsArrayBufferView};
 use js::jsval::{JSVal, NullValue, Int32Value};

components/script/dom/window.rs

@@ -48,7 +48,7 @@ use util::geometry::{self, Au, MAX_RECT};
 use util::opts;
 use util::str::{DOMString,HTML_SPACE_CHARACTERS};
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use js::jsapi::JS_EvaluateUCScript;
 use js::jsapi::JSContext;
 use js::jsapi::{JS_GC, JS_GetRuntime};

components/script/layout_interface.rs

@@ -8,8 +8,8 @@
 
 use dom::node::LayoutData;
 
-use geom::point::Point2D;
-use geom::rect::Rect;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
 use libc::uintptr_t;
 use msg::compositor_msg::LayerId;
 use msg::constellation_msg::{PipelineExitType, WindowSizeData};

components/script/lib.rs

@@ -25,7 +25,7 @@ extern crate log;
 extern crate core;
 extern crate devtools_traits;
 extern crate cssparser;
-extern crate geom;
+extern crate euclid;
 extern crate html5ever;
 extern crate encoding;
 extern crate fnv;

components/script/script_task.rs

@@ -77,8 +77,8 @@ use util::str::DOMString;
 use util::task::spawn_named_with_send_on_failure;
 use util::task_state;
 
-use geom::Rect;
-use geom::point::Point2D;
+use euclid::Rect;
+use euclid::point::Point2D;
 use hyper::header::{LastModified, Headers};
 use js::jsapi::{JS_SetWrapObjectCallbacks, JS_SetExtraGCRootsTracer};
 use js::jsapi::{JSContext, JSRuntime, JSObject, JSTracer};