From ce803475c46d0e9cbb428f0081f8d32888539acb Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Sat, 8 Jun 2024 09:40:58 -0400 Subject: [PATCH] Switch to workspace deps; remove `num_derive` (#141) This makes it easier to update dependencies in a single place. Closes #139 --- Cargo.lock | 12 ---------- Cargo.toml | 30 +++++++++++++++++++++++++ demos/cli/Cargo.toml | 14 ++++++------ demos/constraints/Cargo.toml | 13 +++++------ demos/viewer/Cargo.toml | 23 ++++++++----------- demos/web-editor/Cargo.lock | 18 +++++---------- demos/web-editor/Cargo.toml | 3 ++- demos/web-editor/package-lock.json | 2 +- fidget/Cargo.toml | 36 +++++++++++++++--------------- 9 files changed, 77 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e77de405..4700e858 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -876,7 +876,6 @@ dependencies = [ "ieee754", "libc", "nalgebra", - "num-derive", "num-traits", "ordered-float", "rand", @@ -1543,17 +1542,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-integer" version = "0.1.46" diff --git a/Cargo.toml b/Cargo.toml index 8d3ef956..0f3a6a6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,3 +23,33 @@ opt-level = 1 [profile.fast-test] inherits = "test" opt-level = 0 + +[workspace.dependencies] +anyhow = "1" +arrayvec = "0.7" +bimap = "0.6.3" +bincode = "1.3.3" +clap = { version = "4", features = ["derive"] } +crossbeam-channel = "0.5" +crossbeam-deque = "0.8" +document-features = "0.2" +dynasmrt = { version = "2.0" } +eframe = { version = "0.27", default-features = false, features = [ "default_fonts", "glow"] } +env_logger = "0.11.2" +getrandom = { version = "0.2", features = ["js"] } +ieee754 = "0.2" +image = { version = "0.24", default-features = false, features = ["png"] } +libc = "0.2" +log = "0.4" +nalgebra = "0.32" +notify = "5.0" +num-traits = "0.2" +ordered-float = "3" +rand = "0.8.5" +rhai = { version = "1.17", features = ["sync"] } +serde = { version = "1.0", features = ["derive", "rc"] } +static_assertions = "1" +thiserror = "1" +wasm-bindgen = "0.2.92" +wasm-bindgen-futures = "0.4" +windows = { version = "0.54.0", features = ["Win32_Foundation", "Win32_System_Memory"] } diff --git a/demos/cli/Cargo.toml b/demos/cli/Cargo.toml index c59a85ba..719bce27 100644 --- a/demos/cli/Cargo.toml +++ b/demos/cli/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" edition = "2021" [dependencies] -fidget = { path = "../../fidget", default-features = false, features = ["render", "mesh"] } +anyhow.workspace = true +clap.workspace = true +env_logger.workspace = true +image.workspace = true +log.workspace = true +nalgebra.workspace = true -anyhow = "1" -clap = { version = "4", features = ["derive"] } -env_logger = "0.11.2" -image = { version = "0.24", default-features = false, features = ["png"] } -log = "0.4" -nalgebra = "0.32" +fidget = { path = "../../fidget", default-features = false, features = ["render", "mesh"] } workspace-hack = { version = "0.1", path = "../../workspace-hack" } [features] diff --git a/demos/constraints/Cargo.toml b/demos/constraints/Cargo.toml index b4c3d26d..e5a23502 100644 --- a/demos/constraints/Cargo.toml +++ b/demos/constraints/Cargo.toml @@ -4,18 +4,15 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0" -eframe = { version = "0.27", default-features = false, features = [ - "default_fonts", # Embed the default egui fonts. - "glow", # Use the glow rendering backend. Alternative: "wgpu". -] } +anyhow.workspace = true +eframe.workspace = true +log.workspace = true fidget = { path = "../../fidget", default-features = false, features = ["solver"] } -log = "0.4" workspace-hack = { version = "0.1", path = "../../workspace-hack" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -env_logger = "0.11.2" +env_logger.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen-futures = "0.4" +wasm-bindgen-futures.workspace = true diff --git a/demos/viewer/Cargo.toml b/demos/viewer/Cargo.toml index 3cba9e3e..649c3caf 100644 --- a/demos/viewer/Cargo.toml +++ b/demos/viewer/Cargo.toml @@ -4,22 +4,17 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0" -clap = { version = "4.1.6", features = ["derive"] } -crossbeam-channel = "0.5" -eframe = { version = "0.27", default-features = false, features = [ - #"accesskit", # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies. - "default_fonts", # Embed the default egui fonts. - "glow", # Use the glow rendering backend. Alternative: "wgpu". - #"wgpu" -] } -env_logger = "0.11.2" +anyhow.workspace = true +clap.workspace = true +crossbeam-channel.workspace = true +eframe.workspace = true +env_logger.workspace = true +log.workspace = true +nalgebra.workspace = true +notify.workspace = true +rhai.workspace = true fidget = { path = "../../fidget", default-features = false, features = ["render", "rhai"] } -log = "0.4" -nalgebra = "0.32" -notify = "5.0" -rhai = "1.10" workspace-hack = { version = "0.1", path = "../../workspace-hack" } [features] diff --git a/demos/web-editor/Cargo.lock b/demos/web-editor/Cargo.lock index 4e769392..3acb3204 100644 --- a/demos/web-editor/Cargo.lock +++ b/demos/web-editor/Cargo.lock @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "fidget" -version = "0.3.0" +version = "0.3.2" dependencies = [ "arrayvec", "bimap", @@ -264,7 +264,6 @@ dependencies = [ "getrandom", "ieee754", "nalgebra", - "num-derive", "num-traits", "ordered-float", "rand", @@ -403,17 +402,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -921,6 +909,8 @@ name = "workspace-hack" version = "0.1.0" dependencies = [ "ahash", + "anstream", + "approx", "bitflags", "bytemuck", "clap", @@ -930,12 +920,14 @@ dependencies = [ "libc", "log", "memchr", + "num-traits", "once_cell", "proc-macro2", "quote", "regex", "regex-automata", "serde", + "smallvec", "syn 1.0.109", "syn 2.0.59", ] diff --git a/demos/web-editor/Cargo.toml b/demos/web-editor/Cargo.toml index 7043e268..39532a92 100644 --- a/demos/web-editor/Cargo.toml +++ b/demos/web-editor/Cargo.toml @@ -8,9 +8,10 @@ crate-type = ["cdylib"] [dependencies] bincode = "1.3.3" -fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]} wasm-bindgen = "0.2.92" nalgebra = "0.32" +fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]} + # Take advantage of feature unification to turn on wasm-bindgen here rhai = { version = "*", features = ["wasm-bindgen"] } diff --git a/demos/web-editor/package-lock.json b/demos/web-editor/package-lock.json index 7df9bd4c..29f4b29c 100644 --- a/demos/web-editor/package-lock.json +++ b/demos/web-editor/package-lock.json @@ -1,5 +1,5 @@ { - "name": "wasm-demo", + "name": "web-editor", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/fidget/Cargo.toml b/fidget/Cargo.toml index 1400af9c..1f9a0a79 100644 --- a/fidget/Cargo.toml +++ b/fidget/Cargo.toml @@ -9,35 +9,35 @@ authors = ["Matt Keeter