diff --git a/Cargo.toml b/Cargo.toml index 762429fb..2ffc1b3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,14 @@ [workspace] resolver = "2" -members = ["renderer", "vello", "vger", "tiny_skia", "reactive", "editor-core", "examples/*"] +members = [ + "renderer", + "vello", + "vger", + "tiny_skia", + "reactive", + "editor-core", + "examples/*", +] [workspace.package] license = "MIT" @@ -18,9 +26,9 @@ rust-version = "1.80" license.workspace = true [workspace.dependencies] -peniko = { version = "0.2.0", features = ["serde"] } -serde = "1.0" -lapce-xi-rope = { version = "0.3.2", features = ["serde"] } +peniko = { version = "0.2.0" } +serde = { version = "1.0" } +lapce-xi-rope = { version = "0.3.2" } strum = { version = "0.26.2", features = ["derive"] } strum_macros = { version = "0.26.2" } # Image format features are defined via new features @@ -42,7 +50,7 @@ smallvec = "1.10.0" educe = "0.5.11" taffy = { version = "0.4", features = ["grid"] } rfd = { version = "0.14.0", default-features = false, features = [ - "xdg-portal", + "xdg-portal", ], optional = true } tokio = { version = "1", features = ["sync", "rt"], optional = true } raw-window-handle = { workspace = true } @@ -57,13 +65,16 @@ strum_macros = { workspace = true, optional = true } # TODO: once https://github.com/rust-lang/rust/issues/65991 is stabilized we don't need this downcast-rs = { version = "1.2.0", optional = true } floem_renderer = { path = "renderer", version = "0.2.0" } -floem_vello_renderer ={ path = "vello", version = "0.2.0", optional = true} -floem_vger_renderer ={ path = "vger", version = "0.2.0", optional = true} +floem_vello_renderer = { path = "vello", version = "0.2.0", optional = true } +floem_vger_renderer = { path = "vger", version = "0.2.0", optional = true } floem_tiny_skia_renderer = { path = "tiny_skia", version = "0.2.0" } floem_reactive = { path = "reactive", version = "0.2.0" } floem-winit = { version = "0.29.5", features = ["rwh_05"] } floem-editor-core = { path = "editor-core", version = "0.2.0", optional = true } -copypasta = { version = "0.10.0", default-features = false, features = ["wayland", "x11"] } +copypasta = { version = "0.10.0", default-features = false, features = [ + "wayland", + "x11", +] } parking_lot = { workspace = true } image = { workspace = true } im = { workspace = true } @@ -84,10 +95,21 @@ default = ["editor", "default-image-formats", "vger"] vello = ["dep:floem_vello_renderer"] vger = ["dep:floem_vger_renderer"] -# TODO: this is only winit and the editor serde, there are other dependencies that still depend on -# serde -serde = ["floem-winit/serde", "dep:serde"] -editor = ["floem-editor-core", "dep:lapce-xi-rope", "dep:strum", "dep:strum_macros", "dep:downcast-rs"] +serde = [ + "dep:serde", + "floem-winit/serde", + "peniko/serde", + "lapce-xi-rope/serde", + "smallvec/serde", +] + +editor = [ + "floem-editor-core", + "dep:lapce-xi-rope", + "dep:strum", + "dep:strum_macros", + "dep:downcast-rs", +] # Image support # From: https://github.com/image-rs/image/blob/main/Cargo.toml diff --git a/examples/files/Cargo.toml b/examples/files/Cargo.toml index 970ea3d1..9e1bb7a2 100644 --- a/examples/files/Cargo.toml +++ b/examples/files/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] im.workspace = true -floem = { path = "../.." , features = ["rfd-async-std"] } +floem = { path = "../..", features = ["rfd-async-std"] } diff --git a/examples/syntax-editor/Cargo.toml b/examples/syntax-editor/Cargo.toml index dcea0715..26123776 100644 --- a/examples/syntax-editor/Cargo.toml +++ b/examples/syntax-editor/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" im.workspace = true floem = { path = "../..", features = ["editor"] } syntect = "5.2.0" -lazy_static = "1.4.0" \ No newline at end of file +lazy_static = "1.4.0" diff --git a/examples/todo-complex/Cargo.toml b/examples/todo-complex/Cargo.toml index 5ce7a550..2a2d0c94 100644 --- a/examples/todo-complex/Cargo.toml +++ b/examples/todo-complex/Cargo.toml @@ -5,8 +5,11 @@ edition = "2021" [dependencies] confy = "0.6.1" -floem = { path = "../..", features = ["serde", "vello"], default-features = false } +floem = { path = "../..", features = [ + "serde", + "vello", +], default-features = false } im.workspace = true rusqlite = { version = "0.32.1", features = ["bundled"] } -serde = {workspace = true} +serde = { workspace = true } # serde = { version = "1.0.210", features = ["derive"] } diff --git a/examples/view-transition/Cargo.toml b/examples/view-transition/Cargo.toml index e8d8bd48..0f044bad 100644 --- a/examples/view-transition/Cargo.toml +++ b/examples/view-transition/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] im.workspace = true -floem = { path = "../..", features = ["vello"], default-features = false} +floem = { path = "../..", features = ["vello"], default-features = false } diff --git a/examples/widget-gallery/Cargo.toml b/examples/widget-gallery/Cargo.toml index 57435081..383308cc 100644 --- a/examples/widget-gallery/Cargo.toml +++ b/examples/widget-gallery/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] im.workspace = true -floem = { path = "../.." , features = ["rfd-async-std"] } +floem = { path = "../..", features = ["rfd-async-std"] } strum = { version = "0.25.0", features = ["derive"] } files = { path = "../files/" } diff --git a/examples/window-icon/Cargo.toml b/examples/window-icon/Cargo.toml index 0e5f316d..cfccd773 100644 --- a/examples/window-icon/Cargo.toml +++ b/examples/window-icon/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" im.workspace = true floem = { path = "../.." } image = "0.25" -nsvg = "0.5" \ No newline at end of file +nsvg = "0.5" diff --git a/vger/Cargo.toml b/vger/Cargo.toml index ea4453cf..e0a15ae4 100644 --- a/vger/Cargo.toml +++ b/vger/Cargo.toml @@ -16,5 +16,5 @@ wgpu = { workspace = true } futures = "0.3.26" anyhow = "1.0.69" swash = "0.1.8" -floem-vger-rs = { version = "0.3.1", package = "floem-vger"} +floem-vger-rs = { version = "0.3.1", package = "floem-vger" } floem_renderer = { path = "../renderer", version = "0.2.0" }