Rename `path-utils` to `geometry`

Cargo.lock

@@ -961,8 +961,18 @@ dependencies = [
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "font-kit 0.1.0 (git+https://github.com/pcwalton/font-kit)",
  "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pathfinder_geometry 0.3.0",
  "pathfinder_partitioner 0.2.0",
- "pathfinder_path_utils 0.2.0",
+]
+
+[[package]]
+name = "pathfinder_geometry"
+version = "0.3.0"
+dependencies = [
+ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -986,17 +996,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_geom 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pathfinder_path_utils 0.2.0",
+ "pathfinder_geometry 0.3.0",
- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "pathfinder_path_utils"
-version = "0.2.0"
-dependencies = [
- "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1019,8 +1019,8 @@ dependencies = [
  "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_geom 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pathfinder_geometry 0.3.0",
  "pathfinder_partitioner 0.2.0",
- "pathfinder_path_utils 0.2.0",
  "rocket 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocket_codegen 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocket_contrib 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1535,7 +1535,7 @@ dependencies = [
  "jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_geom 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pathfinder_path_utils 0.2.0",
+ "pathfinder_geometry 0.3.0",
  "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,8 +1,8 @@
 [workspace]
 members = [
+    "geometry",
     "gfx-utils",
     "partitioner",
-    "path-utils",
     "demo/server",
     "utils/area-lut",
     "utils/frontend",

demo/server/Cargo.toml

@@ -42,11 +42,11 @@ git = "https://github.com/servo/fontsan.git"
 [dependencies.font-kit]
 git = "https://github.com/pcwalton/font-kit"
 
+[dependencies.pathfinder_geometry]
+path = "../../geometry"
+
 [dependencies.pathfinder_partitioner]
 path = "../../partitioner"
 
-[dependencies.pathfinder_path_utils]
-path = "../../path-utils"
-
 [patch.crates-io]
 ring = { git = "https://github.com/SergioBenitez/ring", branch = "v0.12" }

demo/server/src/main.rs

@@ -21,8 +21,8 @@ extern crate image;
 extern crate lru_cache;
 extern crate lyon_geom;
 extern crate lyon_path;
+extern crate pathfinder_geometry;
 extern crate pathfinder_partitioner;
-extern crate pathfinder_path_utils;
 extern crate rocket;
 extern crate rocket_contrib;
 
@@ -46,14 +46,14 @@ use image::{DynamicImage, ImageBuffer, ImageFormat, ImageRgba8};
 use lru_cache::LruCache;
 use lyon_path::PathEvent;
 use lyon_path::builder::{FlatPathBuilder, PathBuilder};
+use pathfinder_geometry::cubic_to_quadratic::CubicToQuadraticTransformer;
+use pathfinder_geometry::stroke::{StrokeStyle, StrokeToFillIter};
+use pathfinder_geometry::transform::Transform2DPathIter;
 use lyon_path::iterator::PathIter;
 use pathfinder_partitioner::FillRule;
 use pathfinder_partitioner::mesh::Mesh;
 use pathfinder_partitioner::mesh_pack::MeshPack;
 use pathfinder_partitioner::partitioner::Partitioner;
-use pathfinder_path_utils::cubic_to_quadratic::CubicToQuadraticTransformer;
-use pathfinder_path_utils::stroke::{StrokeStyle, StrokeToFillIter};
-use pathfinder_path_utils::transform::Transform2DPathIter;
 use rocket::http::{ContentType, Header, Status};
 use rocket::request::Request;
 use rocket::response::{NamedFile, Redirect, Responder, Response};
@@ -844,7 +844,7 @@ fn main() {
 mod tiling {
     use euclid::{Point2D, Rect, Size2D, Vector2D};
     use lyon_path::PathEvent;
-    use pathfinder_path_utils::clip::RectClipper;
+    use pathfinder_geometry::clip::RectClipper;
     use std::f32;
     use std::mem;
 

geometry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "pathfinder_path_utils"
+name = "pathfinder_geometry"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]

geometry/src/clip.rs

@@ -1,6 +1,6 @@
-// pathfinder/partitioner/src/clip.rs
+// pathfinder/geometry/src/clip.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/cubic_to_quadratic.rs

@@ -1,6 +1,6 @@
-// pathfinder/partitioner/src/cubic_to_quadratic.rs
+// pathfinder/geometry/src/cubic_to_quadratic.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/lib.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/lib.rs
+// pathfinder/geometry/src/lib.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Various utilities for manipulating Bézier curves.
+//! Utilities for Bézier curves.
 //!
-//! Most of these should go upstream to Lyon at some point.
+//! These may be merged into upstream Lyon eventually.
 
 extern crate arrayvec;
 extern crate lyon_path;

geometry/src/normals.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/normals.rs
+// pathfinder/geometry/src/normals.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/orientation.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/orientation.rs
+// pathfinder/geometry/src/orientation.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/segments.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/segments.rs
+// pathfinder/geometry/src/segments.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/stroke.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/stroke.rs
+// pathfinder/geometry/src/stroke.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

geometry/src/transform.rs

@@ -1,6 +1,6 @@
-// pathfinder/path-utils/src/transform.rs
+// pathfinder/geometry/src/transform.rs
 //
-// Copyright © 2018 The Pathfinder Project Developers.
+// Copyright © 2019 The Pathfinder Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

partitioner/Cargo.toml

@@ -23,5 +23,5 @@ serde_derive = "1.0"
 version = "0.19"
 features = ["serde"]
 
-[dependencies.pathfinder_path_utils]
+[dependencies.pathfinder_geometry]
-path = "../path-utils"
+path = "../geometry"

partitioner/src/builder.rs

@@ -12,7 +12,7 @@ use arrayvec::ArrayVec;
 use euclid::{Angle, Point2D, Vector2D};
 use lyon_geom::{CubicBezierSegment, QuadraticBezierSegment};
 use lyon_path::builder::{FlatPathBuilder, PathBuilder};
-use pathfinder_path_utils::cubic_to_quadratic::CubicToQuadraticSegmentIter;
+use pathfinder_builder::cubic_to_quadratic::CubicToQuadraticSegmentIter;
 use std::ops::Range;
 
 const TANGENT_PARAMETER_TOLERANCE: f32 = 0.001;

partitioner/src/lib.rs

@@ -28,7 +28,7 @@ extern crate byteorder;
 extern crate env_logger;
 extern crate euclid;
 extern crate lyon_path;
-extern crate pathfinder_path_utils;
+extern crate pathfinder_geometry;
 extern crate serde;
 
 use lyon_path::geom as lyon_geom;

partitioner/src/mesh.rs

@@ -11,8 +11,8 @@
 use euclid::approxeq::ApproxEq;
 use euclid::{Point2D, Rect, Size2D, Vector2D};
 use lyon_path::PathEvent;
-use pathfinder_path_utils::normals::PathNormals;
+use pathfinder_geometry::normals::PathNormals;
-use pathfinder_path_utils::segments::{self, SegmentIter};
+use pathfinder_geometry::segments::{self, SegmentIter};
 use std::f32;
 use std::u32;
 

utils/frontend/Cargo.toml

@@ -11,8 +11,8 @@ lyon_path = "0.12"
 git = "https://github.com/pcwalton/font-kit"
 features = ["loader-freetype-default"]
 
+[dependencies.pathfinder_geometry]
+path = "../../geometry"
+
 [dependencies.pathfinder_partitioner]
 path = "../../partitioner"
-
-[dependencies.pathfinder_path_utils]
-path = "../../path-utils"

utils/frontend/src/main.rs

@@ -26,8 +26,8 @@
 extern crate clap;
 extern crate font_kit;
 extern crate lyon_path;
+extern crate pathfinder_geometry;
 extern crate pathfinder_partitioner;
-extern crate pathfinder_path_utils;
 
 use clap::{App, Arg};
 use font_kit::font::Font;
@@ -35,9 +35,9 @@ use font_kit::hinting::HintingOptions;
 use lyon_path::PathEvent;
 use lyon_path::builder::{FlatPathBuilder, PathBuilder};
 use lyon_path::default::Path as LyonPath;
-use pathfinder_partitioner::FillRule;
+use pathfinder_geometry::FillRule;
-use pathfinder_partitioner::mesh_pack::MeshPack;
+use pathfinder_geometry::mesh_pack::MeshPack;
-use pathfinder_partitioner::partitioner::Partitioner;
+use pathfinder_geometry::partitioner::Partitioner;
 use std::fs::File;
 use std::path::{Path, PathBuf};
 use std::process;

utils/tile-svg/Cargo.toml

@@ -19,8 +19,8 @@ simdeez = "0.4"
 svgtypes = "0.3"
 usvg = "0.4"
 
-[dependencies.pathfinder_path_utils]
+[dependencies.pathfinder_geometry]
-path = "../../path-utils"
+path = "../../geometry"
 
 [dev-dependencies]
 quickcheck = "0.7"

utils/tile-svg/src/main.rs

@@ -28,7 +28,7 @@ use lyon_geom::math::Transform;
 use lyon_geom::{CubicBezierSegment, QuadraticBezierSegment};
 use lyon_path::PathEvent;
 use lyon_path::iterator::PathIter;
-use pathfinder_path_utils::stroke::{StrokeStyle, StrokeToFillIter};
+use pathfinder_geometry::stroke::{StrokeStyle, StrokeToFillIter};
 use rayon::ThreadPoolBuilder;
 use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
 use simdeez::Simd;