Use euclid from crates.io

components/layout/Cargo.toml

@@ -52,9 +52,6 @@ path = "../util"
 [dependencies.selectors]
 git = "https://github.com/servo/rust-selectors"
 
-[dependencies.geom]
-git = "https://github.com/servo/rust-geom"
-
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
@@ -73,3 +70,4 @@ cssparser = "0.3.1"
 smallvec = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
+euclid = "0.1"

components/layout/block.rs

@@ -48,7 +48,7 @@ use model::{IntrinsicISizes, MarginCollapseInfo};
 use model::{MaybeAuto, CollapsibleMargins, specified, specified_or_none};
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use gfx::display_list::{ClippingRegion, DisplayList};
 use msg::compositor_msg::LayerId;
 use rustc_serialize::{Encoder, Encodable};

components/layout/context.rs

@@ -11,7 +11,7 @@ use css::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache};
 use canvas_traits::CanvasMsg;
 use msg::compositor_msg::LayerId;
 use fnv::FnvHasher;
-use geom::{Rect, Size2D};
+use euclid::{Rect, Size2D};
 use gfx::display_list::OpaqueNode;
 use gfx::font_cache_task::FontCacheTask;
 use gfx::font_context::FontContext;

components/layout/display_list_builder.rs

@@ -21,8 +21,8 @@ use list_item::ListItemFlow;
 use model::{self, MaybeAuto, ToGfxMatrix, ToAu};
 use table_cell::CollapsedBordersForCell;
 
-use geom::{Point2D, Rect, Size2D, SideOffsets2D};
-use geom::Matrix4;
+use euclid::{Point2D, Rect, Size2D, SideOffsets2D};
+use euclid::Matrix4;
 use gfx_traits::color;
 use gfx::display_list::{BLUR_INFLATION_FACTOR, BaseDisplayItem, BorderDisplayItem};
 use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, ClippingRegion};

components/layout/flow.rs

@@ -47,7 +47,7 @@ use table_wrapper::TableWrapperFlow;
 use multicol::MulticolFlow;
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use gfx::display_list::ClippingRegion;
 use msg::compositor_msg::LayerId;
 use msg::constellation_msg::ConstellationChan;

components/layout/fragment.rs

@@ -21,7 +21,7 @@ use text;
 use opaque_node::OpaqueNodeMethods;
 use wrapper::{TLayoutNode, ThreadSafeLayoutNode};
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use gfx::display_list::{BLUR_INFLATION_FACTOR, OpaqueNode};
 use gfx::text::glyph::CharIndex;
 use gfx::text::text_run::{TextRun, TextRunSlice};

components/layout/inline.rs

@@ -17,7 +17,7 @@ use layout_debug;
 use model::IntrinsicISizesContribution;
 use text;
 
-use geom::{Point2D, Rect, Size2D};
+use euclid::{Point2D, Rect, Size2D};
 use gfx::display_list::OpaqueNode;
 use gfx::font::FontMetrics;
 use gfx::font_context::FontContext;

components/layout/layout_task.rs

@@ -28,11 +28,11 @@ use canvas_traits::CanvasMsg;
 use encoding::EncodingRef;
 use encoding::all::UTF_8;
 use fnv::FnvHasher;
-use geom::Matrix4;
-use geom::point::Point2D;
-use geom::rect::Rect;
-use geom::scale_factor::ScaleFactor;
-use geom::size::Size2D;
+use euclid::Matrix4;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
+use euclid::scale_factor::ScaleFactor;
+use euclid::size::Size2D;
 use gfx_traits::color;
 use gfx::display_list::{ClippingRegion, DisplayItemMetadata, DisplayList, OpaqueNode};
 use gfx::display_list::{StackingContext};

components/layout/lib.rs

@@ -42,7 +42,7 @@ extern crate clock_ticks;
 extern crate cssparser;
 extern crate encoding;
 extern crate fnv;
-extern crate geom;
+extern crate euclid;
 extern crate gfx;
 extern crate gfx_traits;
 extern crate layout_traits;

components/layout/list_item.rs

@@ -19,7 +19,7 @@ use inline::InlineMetrics;
 use text;
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use gfx::display_list::DisplayList;
 use util::geometry::Au;
 use util::logical_geometry::LogicalSize;

components/layout/model.rs

@@ -8,7 +8,7 @@
 
 use fragment::Fragment;
 
-use geom::{Matrix4, SideOffsets2D};
+use euclid::{Matrix4, SideOffsets2D};
 use std::cmp::{max, min};
 use std::fmt;
 use style::computed_values::transform::ComputedMatrix;

components/layout/multicol.rs

@@ -13,7 +13,7 @@ use flow::{FlowClass, Flow, OpaqueFlow};
 use fragment::{Fragment, FragmentBorderBoxIterator};
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use util::geometry::Au;
 use util::logical_geometry::LogicalSize;
 use std::fmt;

components/layout/sequential.rs

@@ -17,7 +17,7 @@ use wrapper::LayoutNode;
 use wrapper::{PostorderNodeMutTraversal};
 use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
 
-use geom::point::Point2D;
+use euclid::point::Point2D;
 use util::geometry::{Au, ZERO_POINT};
 use util::opts;
 

components/layout/table.rs

@@ -21,7 +21,7 @@ use table_row::{TableRowFlow};
 use table_wrapper::TableLayout;
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use gfx::display_list::DisplayList;
 use std::cmp;
 use std::fmt;

components/layout/table_caption.rs

@@ -12,7 +12,7 @@ use flow::{FlowClass, Flow, OpaqueFlow};
 use fragment::{Fragment, FragmentBorderBoxIterator};
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use util::geometry::Au;
 use util::logical_geometry::LogicalSize;
 use std::fmt;

components/layout/table_cell.rs

@@ -19,7 +19,7 @@ use table_row::{CollapsedBorder, CollapsedBorderProvenance};
 use wrapper::ThreadSafeLayoutNode;
 
 use cssparser::Color;
-use geom::{Point2D, Rect, SideOffsets2D, Size2D};
+use euclid::{Point2D, Rect, SideOffsets2D, Size2D};
 use gfx::display_list::DisplayList;
 use std::fmt;
 use std::sync::Arc;

components/layout/table_colgroup.rs

@@ -13,7 +13,7 @@ use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo};
 use layout_debug;
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use util::geometry::{Au, ZERO_RECT};
 use std::cmp::max;
 use std::fmt;

components/layout/table_row.rs

@@ -19,7 +19,7 @@ use model::MaybeAuto;
 use wrapper::ThreadSafeLayoutNode;
 
 use cssparser::{Color, RGBA};
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use gfx::display_list::DisplayList;
 use rustc_serialize::{Encoder, Encodable};
 use std::cmp::max;

components/layout/table_rowgroup.rs

@@ -16,7 +16,7 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable,
 use table_row::{self, CollapsedBordersForRow};
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use rustc_serialize::{Encoder, Encodable};
 use std::fmt;
 use std::iter::{IntoIterator, Iterator, Peekable};

components/layout/table_wrapper.rs

@@ -25,7 +25,7 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize};
 use table_row;
 use wrapper::ThreadSafeLayoutNode;
 
-use geom::{Point2D, Rect};
+use euclid::{Point2D, Rect};
 use util::geometry::Au;
 use util::logical_geometry::LogicalSize;
 use std::cmp::{max, min};