diff --git a/Cargo.lock b/Cargo.lock index 74e2147412..6988fd1948 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,8 @@ dependencies = [ [[package]] name = "kurbo" version = "0.8.1" -source = "git+https://github.com/GraphiteEditor/kurbo.git?branch=bezpath-partial-eq#3f86bda9ba77d3b1279612bc5779e425f2d8714d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e30b1df631d23875f230ed3ddd1a88c231f269a04b2044eb6ca87e763b5f4c42" dependencies = [ "arrayvec", ] diff --git a/core/document/Cargo.toml b/core/document/Cargo.toml index 0f7882eab1..9d8657640e 100644 --- a/core/document/Cargo.toml +++ b/core/document/Cargo.toml @@ -10,8 +10,6 @@ license = "Apache-2.0" [dependencies] log = "0.4" -# TODO: Swich to kurbo release when derive `PartialEq` is available for BezPath -#kurbo = "0.8.0" -kurbo = {git="https://github.com/GraphiteEditor/kurbo.git", branch="bezpath-partial-eq"} +kurbo = "0.8" serde = { version = "1.0", features = ["derive"] } glam = "0.16" diff --git a/core/document/src/document.rs b/core/document/src/document.rs index 5ccbf6f6b9..d376a292db 100644 --- a/core/document/src/document.rs +++ b/core/document/src/document.rs @@ -5,7 +5,7 @@ use crate::{ DocumentError, DocumentResponse, LayerId, Operation, }; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct Document { pub root: Layer, pub work: Layer, diff --git a/core/document/src/layers/ellipse.rs b/core/document/src/layers/ellipse.rs index 56a07157c0..25c838c50a 100644 --- a/core/document/src/layers/ellipse.rs +++ b/core/document/src/layers/ellipse.rs @@ -5,7 +5,7 @@ use super::LayerData; use std::fmt::Write; -#[derive(Debug, Clone, Copy, PartialEq, Default)] +#[derive(Debug, Clone, Copy, Default)] pub struct Ellipse {} impl Ellipse { diff --git a/core/document/src/layers/folder.rs b/core/document/src/layers/folder.rs index bafff20fd2..55fc723830 100644 --- a/core/document/src/layers/folder.rs +++ b/core/document/src/layers/folder.rs @@ -4,7 +4,7 @@ use super::{style, Layer, LayerData, LayerDataTypes}; use std::fmt::Write; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct Folder { next_assignment_id: LayerId, pub layer_ids: Vec, diff --git a/core/document/src/layers/line.rs b/core/document/src/layers/line.rs index 7595380fce..1419833033 100644 --- a/core/document/src/layers/line.rs +++ b/core/document/src/layers/line.rs @@ -6,7 +6,7 @@ use super::LayerData; use std::fmt::Write; -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy)] pub struct Line {} impl Line { diff --git a/core/document/src/layers/mod.rs b/core/document/src/layers/mod.rs index 2ee4ad8c10..7c485bb564 100644 --- a/core/document/src/layers/mod.rs +++ b/core/document/src/layers/mod.rs @@ -26,7 +26,7 @@ pub trait LayerData { fn to_kurbo_path(&mut self, transform: glam::DAffine2, style: style::PathStyle) -> BezPath; } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub enum LayerDataTypes { Folder(Folder), Ellipse(Ellipse), @@ -77,7 +77,7 @@ impl LayerDataTypes { } } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct Layer { pub visible: bool, pub name: Option, diff --git a/core/document/src/layers/polyline.rs b/core/document/src/layers/polyline.rs index 4892e0320f..3eb96ab0bf 100644 --- a/core/document/src/layers/polyline.rs +++ b/core/document/src/layers/polyline.rs @@ -2,7 +2,7 @@ use std::fmt::Write; use super::{style, LayerData}; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct PolyLine { points: Vec, } diff --git a/core/document/src/layers/rect.rs b/core/document/src/layers/rect.rs index 503430ddad..2316f13b77 100644 --- a/core/document/src/layers/rect.rs +++ b/core/document/src/layers/rect.rs @@ -6,7 +6,7 @@ use super::LayerData; use std::fmt::Write; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct Rect {} impl Rect { diff --git a/core/document/src/layers/shape.rs b/core/document/src/layers/shape.rs index d00134287a..d4cf4b1084 100644 --- a/core/document/src/layers/shape.rs +++ b/core/document/src/layers/shape.rs @@ -6,7 +6,7 @@ use super::LayerData; use std::fmt::Write; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone)] pub struct Shape { equal_sides: bool, sides: u8,