diff --git a/demo/server/Cargo.toml b/demo/server/Cargo.toml index 90d13473..0def8d21 100644 --- a/demo/server/Cargo.toml +++ b/demo/server/Cargo.toml @@ -13,13 +13,13 @@ app_units = "0.6" base64 = "0.6" bincode = "1.0" env_logger = "0.5" -euclid = "0.17" +euclid = "0.18" image = "0.17" lazy_static = "0.2" log = "0.3" lru-cache = "0.1" -lyon_geom = "0.10" -lyon_path = "0.10" +lyon_geom = "0.11" +lyon_path = "0.11" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/font-renderer/Cargo.toml b/font-renderer/Cargo.toml index c9bd360d..9e3578fe 100644 --- a/font-renderer/Cargo.toml +++ b/font-renderer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pathfinder_font_renderer" -version = "0.4.0" +version = "0.5.0" authors = ["Patrick Walton "] [features] @@ -11,13 +11,12 @@ freetype-backend = ["freetype"] app_units = "0.6" libc = "0.2" log = "0.3" -lyon_geom = "0.10" -lyon_path = "0.10" +lyon_path = "0.11" serde = "1.0" serde_derive = "1.0" [dependencies.euclid] -version = "0.17" +version = "0.18" features = ["serde"] [dependencies.freetype] diff --git a/font-renderer/src/lib.rs b/font-renderer/src/lib.rs index 60aedb65..9a33a501 100644 --- a/font-renderer/src/lib.rs +++ b/font-renderer/src/lib.rs @@ -20,7 +20,6 @@ extern crate app_units; extern crate euclid; extern crate libc; -extern crate lyon_geom; extern crate lyon_path; extern crate serde; diff --git a/gfx-utils/Cargo.toml b/gfx-utils/Cargo.toml index 143c015b..343d6a3c 100644 --- a/gfx-utils/Cargo.toml +++ b/gfx-utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pathfinder_gfx_utils" -version = "0.1.0" +version = "0.2.0" authors = ["Patrick Walton "] [dependencies] -euclid = "0.17" \ No newline at end of file +euclid = "0.18" \ No newline at end of file diff --git a/partitioner/Cargo.toml b/partitioner/Cargo.toml index 2c08182e..ee78b17e 100644 --- a/partitioner/Cargo.toml +++ b/partitioner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pathfinder_partitioner" -version = "0.1.0" +version = "0.2.0" authors = ["Patrick Walton "] [lib] @@ -14,13 +14,13 @@ byteorder = "1.2" env_logger = "0.5" half = "1.0" log = "0.3" -lyon_geom = "0.10" -lyon_path = "0.10" +lyon_geom = "0.11" +lyon_path = "0.11" serde = "1.0" serde_derive = "1.0" [dependencies.euclid] -version = "0.17" +version = "0.18" features = ["serde"] [dependencies.pathfinder_path_utils] diff --git a/partitioner/src/lib.rs b/partitioner/src/lib.rs index d81482a5..07c9cc06 100644 --- a/partitioner/src/lib.rs +++ b/partitioner/src/lib.rs @@ -27,11 +27,12 @@ extern crate bit_vec; extern crate byteorder; extern crate env_logger; extern crate euclid; -extern crate lyon_geom; extern crate lyon_path; extern crate pathfinder_path_utils; extern crate serde; +use lyon_path::geom as lyon_geom; + #[macro_use] extern crate log; #[macro_use] diff --git a/path-utils/Cargo.toml b/path-utils/Cargo.toml index 02a6e499..961bc190 100644 --- a/path-utils/Cargo.toml +++ b/path-utils/Cargo.toml @@ -1,12 +1,10 @@ [package] name = "pathfinder_path_utils" -version = "0.1.0" +version = "0.2.0" authors = ["Patrick Walton "] [dependencies] arrayvec = "0.4" -euclid = "0.17" -lyon_geom = "0.10" -lyon_path = "0.10" +lyon_path = "0.11" serde = "1.0" serde_derive = "1.0" diff --git a/path-utils/src/lib.rs b/path-utils/src/lib.rs index 4e6d847a..6c5ad812 100644 --- a/path-utils/src/lib.rs +++ b/path-utils/src/lib.rs @@ -13,10 +13,11 @@ //! Most of these should go upstream to Lyon at some point. extern crate arrayvec; -extern crate euclid; -extern crate lyon_geom; extern crate lyon_path; +use lyon_path::geom as lyon_geom; +use lyon_path::geom::euclid; + pub mod cubic_to_quadratic; pub mod normals; pub mod orientation; diff --git a/utils/area-lut/Cargo.toml b/utils/area-lut/Cargo.toml index 03094d96..eeceff7d 100644 --- a/utils/area-lut/Cargo.toml +++ b/utils/area-lut/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "area-lut" -version = "0.1.0" +version = "0.2.0" authors = ["Patrick Walton "] [dependencies] clap = "2.30" -euclid = "0.17" +euclid = "0.18" image = "0.18" diff --git a/utils/frontend/Cargo.toml b/utils/frontend/Cargo.toml index ab2ef261..d628791c 100644 --- a/utils/frontend/Cargo.toml +++ b/utils/frontend/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "pathfinder" -version = "0.1.0" +version = "0.2.0" authors = ["Patrick Walton "] [dependencies] app_units = "0.6" clap = "2.27" freetype = "0.4" -lyon_geom = "0.10" -lyon_path = "0.10" +lyon_path = "0.11" [dependencies.pathfinder_font_renderer] path = "../../font-renderer" diff --git a/utils/frontend/src/main.rs b/utils/frontend/src/main.rs index 4101df6b..92c52405 100644 --- a/utils/frontend/src/main.rs +++ b/utils/frontend/src/main.rs @@ -26,7 +26,6 @@ extern crate app_units; extern crate clap; extern crate freetype; -extern crate lyon_geom; extern crate lyon_path; extern crate pathfinder_font_renderer; extern crate pathfinder_partitioner;