Skip to content

Commit

Permalink
Re-order toml keys
Browse files Browse the repository at this point in the history
  • Loading branch information
KmolYuan committed Aug 25, 2024
1 parent a12d648 commit 1282da9
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 47 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ members = ["four-bar", "four-bar-ui"]
resolver = "2"

[workspace.package]
version = "7.0.1"
authors = ["KmolYuan <[email protected]>"]
categories = ["algorithms"]
edition = "2021"
keywords = ["mechanism", "simulation", "optimization"]
license = "AGPL-3.0-or-later"
repository = "https://github.com/KmolYuan/four-bar-rs"
keywords = ["mechanism", "simulation", "optimization"]
categories = ["algorithms"]
version = "7.0.1"

[workspace.lints.clippy]
semicolon-if-nothing-returned = "warn"
Expand Down
56 changes: 28 additions & 28 deletions four-bar-ui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "four-bar-ui"
version.workspace = true
authors.workspace = true
edition.workspace = true
categories.workspace = true
description = "Four🍀bar GUI is a simulator, a synthesis tool for four-bar linkages."
readme = "../README.md"
edition.workspace = true
keywords.workspace = true
license.workspace = true
name = "four-bar-ui"
readme = "../README.md"
repository.workspace = true
keywords.workspace = true
categories.workspace = true
version.workspace = true

[[bin]]
name = "four-bar"
Expand All @@ -22,41 +22,41 @@ native = ["four-bar/clap", "four-bar/rayon", "image/rayon"]
native-win-release = ["winapi", "native"]

[dependencies]
smartcore = { version = "0.3", features = ["ndarray-bindings"] }
serde = { version = "1", features = ["derive"] }
egui_plot = "0.28"
const-str = "0.5"
eframe = { version = "0.28", default-features = false, features = [
"accesskit",
"persistence",
"glow",
] }
egui_plot = "0.28"
four-bar = { path = "../four-bar", version = "7", features = [
"csv",
"atlas",
"plot",
] }
image = { version = "0.25", default-features = false, features = [
"ico",
"jpeg",
"gif",
] }
rfd = "0.14"
ron = { git = "https://github.com/ron-rs/ron" }

[dependencies.four-bar]
version = "7"
path = "../four-bar"
features = ["csv", "atlas", "plot"]

[dependencies.eframe]
version = "0.28"
default-features = false
features = ["accesskit", "persistence", "glow"]

[dependencies.image]
version = "0.25"
default-features = false
features = ["ico", "jpeg", "gif"]
serde = { version = "1", features = ["derive"] }
smartcore = { version = "0.3", features = ["ndarray-bindings"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# native here!
indicatif = { version = "0.17", features = ["improved_unicode"] }
clap = { version = "4", features = ["derive"] }
indicatif = { version = "0.17", features = ["improved_unicode"] }
wild = "2"

[target.'cfg(target_arch = "wasm32")'.dependencies]
# wasm here!
instant = { version = "0.1", features = ["wasm-bindgen"] }
console_error_panic_hook = "0.1"
wasm-bindgen-futures = "0.4"
wasm-bindgen = "0.2"
instant = { version = "0.1", features = ["wasm-bindgen"] }
tracing-wasm = "0.2"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
# FIXME: https://github.com/emilk/egui/issues/4961
web-sys = "=0.3.69"

Expand Down
32 changes: 16 additions & 16 deletions four-bar/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[package]
name = "four-bar"
version.workspace = true
authors.workspace = true
edition.workspace = true
categories.workspace = true
description = "Four🍀bar library provides simulation and synthesis function for four-bar linkages."
readme = "README.md"
edition.workspace = true
keywords.workspace = true
license.workspace = true
name = "four-bar"
readme = "README.md"
repository.workspace = true
keywords.workspace = true
categories.workspace = true
version.workspace = true

[features]
default = []
serde = ["dep:serde", "mh/serde"]
atlas = ["ndarray", "ndarray-npy"]
clap = ["dep:clap", "mh/clap"]
csv = ["dep:csv", "serde"]
default = []
plot = ["plotters", "plotters-backend", "fmtastic"]
rayon = ["mh/rayon"]
clap = ["dep:clap", "mh/clap"]
atlas = ["ndarray", "ndarray-npy"]
serde = ["dep:serde", "mh/serde"]

[dependencies]
clap = { version = "4", optional = true }
csv = { version = "1", optional = true }
efd = "10.1"
fmtastic = { version = "0.2", optional = true }
mh = { version = "10.1", package = "metaheuristics-nature" }
ndarray = { version = "0.15", features = ["rayon"], optional = true }
ndarray-npy = { version = "0.8", optional = true }
serde = { version = "1", features = ["derive"], optional = true }
plotters = { version = "0.3", optional = true }
plotters-backend = { version = "0.3", optional = true }
fmtastic = { version = "0.2", optional = true }
clap = { version = "4", optional = true }
csv = { version = "1", optional = true }
mh = { version = "10.1", package = "metaheuristics-nature" }
efd = "10.1"
serde = { version = "1", features = ["derive"], optional = true }

[dev-dependencies]
approx = "0.5"
Expand Down

0 comments on commit 1282da9

Please sign in to comment.