chore: fmt meson, toml files

flxzt · Feb 22, 2024 · 2c6ad0b · 2c6ad0b
1 parent e578ec5
commit 2c6ad0b
Show file tree

Hide file tree

Showing 11 changed files with 195 additions and 195 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,93 +8,95 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.9.4"
-edition = "2021"
-rust-version = "1.70"
 authors = ["The Rnote Authors"]
-license = "GPL-3.0-or-later"
+edition = "2021"
 homepage = "https://rnote.flxzt.net"
+license = "GPL-3.0-or-later"
 repository = "https://github.com/flxzt/rnote"
+rust-version = "1.70"
+version = "0.9.4"
 
 [workspace.dependencies]
-rnote-compose = { version="0.9.4", path = "crates/rnote-compose" }
-rnote-engine = { version="0.9.4", path = "crates/rnote-engine" }
+rnote-compose = { version = "0.9.4", path = "crates/rnote-compose" }
+rnote-engine = { version = "0.9.4", path = "crates/rnote-engine" }
 
-tracing = "0.1"
-tracing-subscriber = {version = "0.3", features = ["env-filter"] }
 anyhow = "1"
-thiserror = "1"
 approx = "0.5.1"
-num-derive = "0.4"
-num-traits = "0.2"
-itertools = "0.12"
-once_cell = "1"
+atty = "0.2"
+base64 = "0.21"
+cairo-rs = { version = "0.19.1", features = ["v1_18", "png", "svg", "pdf"] }
+chrono = "0.4.33"
+clap = { version = "4", features = ["derive"] }
+dialoguer = "0.11"
+flate2 = "1"
+fs_extra = "1"
 futures = "0.3"
-rayon = "1"
-serde = { version = "1", features = ["derive", "rc"] }
-serde_json = "1"
+geo = "0.27"
+gettext-rs = { version = "0.7", features = ["gettext-system"] }
+gio = "0.19.0"
+glib = "0.19.0"
+glib-build-tools = "0.19.0"
 ijson = "0.1"
+image = "0.24"
+indicatif = "0.17"
+itertools = "0.12"
+kurbo = "0.10"
 nalgebra = { version = "0.32", features = ["serde-serialize"] }
+num-derive = "0.4"
+num-traits = "0.2"
+once_cell = "1"
+open = "5"
+palette = "0.7.4"
 parry2d-f64 = { version = "0.13", features = ["serde-serialize"] }
+piet = "0.6"
+piet-cairo = "0.6"
 rand = "0.8"
-rand_pcg = "0.3"
 rand_distr = "0.4"
-slotmap = { version = "1", features = ["serde"] }
-rstar = "0.12"
-geo = "0.27"
-flate2 = "1"
-chrono = "0.4.33"
-base64 = "0.21"
-semver = { version = "1", features = ["serde"]}
+rand_pcg = "0.3"
+rayon = "1"
 regex = "1.10"
-url = "2"
-fs_extra = "1"
+rodio = { version = "0.17", default-features = false, features = [
+    "symphonia-wav",
+] }
+rough_piet = "0.6"
+roughr = "0.6"
+roxmltree = "0.19"
+rstar = "0.12"
 same-file = "1"
+semver = { version = "1", features = ["serde"] }
+serde = { version = "1", features = ["derive", "rc"] }
+serde_json = "1"
+slotmap = { version = "1", features = ["serde"] }
+smol = "2"
+svg = "0.15.1"
+thiserror = "1"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 unicode-segmentation = "1"
-roxmltree = "0.19"
-xmlwriter = "0.1"
+url = "2"
 usvg = "0.40"
-svg = "0.15.1"
-image = "0.24"
-kurbo = "0.10"
-piet = "0.6"
-piet-cairo = "0.6"
-roughr = "0.6"
-rough_piet = "0.6"
-palette = "0.7.4"
-rodio = { version = "0.17", default-features = false, features = ["symphonia-wav"] }
 winresource = "0.1"
-smol = "2"
-clap = { version = "4", features = ["derive"] }
-indicatif = "0.17"
-dialoguer = "0.11"
-open = "5"
-atty = "0.2"
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
-glib = "0.19.0"
-glib-build-tools = "0.19.0"
-gio = "0.19.0"
-cairo-rs = { version = "0.19.1", features = ["v1_18", "png", "svg", "pdf"] }
+xmlwriter = "0.1"
+adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
+gtk4 = { version = "0.8.0", features = ["v4_12"] }
 # once a new librsvg (current v2.57.1) is released that includes updated cairo,
 # this can be replaced by the version on crates-io.
 librsvg = { git = "https://gitlab.gnome.org/GNOME/librsvg", rev = "3a497b56fe581ab4fda1a80ac19352bfb91676b6" }
-poppler-rs = { version = "0.23.0", features = ["v22_2"] }
-gtk4 = { version = "0.8.0", features = ["v4_12"] }
-adw = { version = "0.6.0", package="libadwaita", features = ["v1_4"] }
 numeric-sort = "0.1"
+poppler-rs = { version = "0.23.0", features = ["v22_2"] }
 
 [patch.crates-io]
 # once a new piet (current v0.6.2) is released with updated cairo and kurbo deps, this can be removed.
 piet = { git = "https://github.com/linebender/piet", rev = "30813def608e74c0fc1a6aaf726bd3f7bf6964c2" }
 piet-cairo = { git = "https://github.com/linebender/piet", rev = "30813def608e74c0fc1a6aaf726bd3f7bf6964c2" }
 
 [profile.dev]
-opt-level = 2
 debug = true
+opt-level = 2
 
 [profile.release]
-opt-level = 3
-lto = "fat"
 codegen-units = 1
+lto = "fat"
+opt-level = 3
 # We want to be able to debug in the release build as well
 debug = true
diff --git a/crates/rnote-cli/Cargo.toml b/crates/rnote-cli/Cargo.toml
@@ -1,25 +1,25 @@
 [package]
-name = "rnote-cli"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
 authors.workspace = true
-license.workspace = true
+edition.workspace = true
 homepage.workspace = true
+license.workspace = true
+name = "rnote-cli"
 repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 rnote-compose = { workspace = true, features = ["clap-derive"] }
 rnote-engine = { workspace = true, features = ["cli"] }
 
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
 anyhow = { workspace = true }
-smol = { workspace = true }
+atty = { workspace = true }
 clap = { workspace = true }
-indicatif = { workspace = true }
 dialoguer = { workspace = true }
-open = { workspace = true }
+indicatif = { workspace = true }
 nalgebra = { workspace = true }
+open = { workspace = true }
 parry2d-f64 = { workspace = true }
-atty = { workspace = true }
+smol = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
diff --git a/crates/rnote-compose/Cargo.toml b/crates/rnote-compose/Cargo.toml
@@ -1,38 +1,38 @@
 [package]
-name = "rnote-compose"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
 authors.workspace = true
-license.workspace = true
+edition.workspace = true
 homepage.workspace = true
+license.workspace = true
+name = "rnote-compose"
 repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 ink-stroke-modeler-rs = { git = "https://github.com/flxzt/ink-stroke-modeler-rs", rev = "b67f11b2c174a9ae4a54c22313cf8c218ff0946a" }
 
-tracing = { workspace = true }
 anyhow = { workspace = true }
+approx = { workspace = true }
+base64 = { workspace = true }
+clap = { workspace = true, optional = true }
+kurbo = { workspace = true }
+nalgebra = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
-approx = { workspace = true }
 once_cell = { workspace = true }
-serde = { workspace = true }
-nalgebra = { workspace = true }
+palette = { workspace = true }
 parry2d-f64 = { workspace = true }
+piet = { workspace = true }
+piet-cairo = { workspace = true }
 rand = { workspace = true }
-rand_pcg = { workspace = true }
 rand_distr = { workspace = true }
-base64 = { workspace = true }
+rand_pcg = { workspace = true }
 regex = { workspace = true }
-svg = { workspace = true }
-kurbo = { workspace = true }
-piet = { workspace = true }
-piet-cairo = { workspace = true }
-roughr = { workspace = true }
 rough_piet = { workspace = true }
-palette = { workspace = true }
-clap = { workspace = true, optional = true }
+roughr = { workspace = true }
+serde = { workspace = true }
+svg = { workspace = true }
+tracing = { workspace = true }
 
 [features]
-clap-derive = [ "dep:clap" ]
+clap-derive = ["dep:clap"]
diff --git a/crates/rnote-compose/src/meson.build b/crates/rnote-compose/src/meson.build
@@ -13,8 +13,8 @@ rnote_compose_sources = files(
     'builders/penpathcurvedbuilder.rs',
     'builders/penpathmodeledbuilder.rs',
     'builders/penpathsimplebuilder.rs',
-    'builders/polylinebuilder.rs',
     'builders/polygonbuilder.rs',
+    'builders/polylinebuilder.rs',
     'builders/quadbezbuilder.rs',
     'builders/quadrantcoordsystem2dbuilder.rs',
     'builders/rectanglebuilder.rs',
@@ -26,22 +26,22 @@ rnote_compose_sources = files(
     'shapes/ellipse.rs',
     'shapes/line.rs',
     'shapes/mod.rs',
-    'shapes/polyline.rs',
     'shapes/polygon.rs',
+    'shapes/polyline.rs',
     'shapes/quadbez.rs',
     'shapes/rectangle.rs',
     'shapes/shape.rs',
     'shapes/shapeable.rs',
+    'style/composer.rs',
+    'style/indicators.rs',
+    'style/mod.rs',
     'style/rough/mod.rs',
     'style/rough/roughoptions.rs',
     'style/smooth/mod.rs',
     'style/smooth/smoothoptions.rs',
     'style/textured/mod.rs',
     'style/textured/textureddotsdistribution.rs',
     'style/textured/texturedoptions.rs',
-    'style/composer.rs',
-    'style/indicators.rs',
-    'style/mod.rs',
     'transform/mod.rs',
     'transform/transformable.rs',
     'color.rs',

diff --git a/crates/rnote-engine/Cargo.toml b/crates/rnote-engine/Cargo.toml
@@ -1,66 +1,66 @@
 [package]
-name = "rnote-engine"
-version.workspace = true
-edition.workspace = true
-rust-version.workspace = true
 authors.workspace = true
-license.workspace = true
+edition.workspace = true
 homepage.workspace = true
+license.workspace = true
+name = "rnote-engine"
 repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 rnote-compose = { workspace = true }
 
-tracing = { workspace = true }
 anyhow = { workspace = true }
-thiserror = { workspace = true }
-num-derive = { workspace = true }
-num-traits = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
+base64 = { workspace = true }
+cairo-rs = { workspace = true }
+chrono = { workspace = true }
+flate2 = { workspace = true }
 futures = { workspace = true }
-rayon = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
+geo = { workspace = true }
+gio = { workspace = true }
+glib = { workspace = true }
 ijson = { workspace = true }
+image = { workspace = true }
+itertools = { workspace = true }
+kurbo = { workspace = true }
+librsvg = { workspace = true }
 nalgebra = { workspace = true }
+num-derive = { workspace = true }
+num-traits = { workspace = true }
+once_cell = { workspace = true }
 parry2d-f64 = { workspace = true }
-chrono = { workspace = true }
-semver = { workspace = true }
+piet = { workspace = true }
+piet-cairo = { workspace = true }
+poppler-rs = { workspace = true }
 rand = { workspace = true }
-rand_pcg = { workspace = true }
 rand_distr = { workspace = true }
-slotmap = { workspace = true }
-rstar = { workspace = true }
-geo = { workspace = true }
-flate2 = { workspace = true }
-base64 = { workspace = true }
+rand_pcg = { workspace = true }
+rayon = { workspace = true }
 regex = { workspace = true }
-unicode-segmentation = { workspace = true }
+rodio = { workspace = true }
+rough_piet = { workspace = true }
+roughr = { workspace = true }
 roxmltree = { workspace = true }
-xmlwriter = { workspace = true }
-usvg = { workspace = true }
+rstar = { workspace = true }
+semver = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+slotmap = { workspace = true }
 svg = { workspace = true }
-image = { workspace = true }
-kurbo = { workspace = true }
-piet = { workspace = true }
-piet-cairo = { workspace = true }
-roughr = { workspace = true }
-rough_piet = { workspace = true }
-rodio = { workspace = true }
-glib = { workspace = true }
-gio = { workspace = true }
-cairo-rs = { workspace = true }
-librsvg = { workspace = true }
-poppler-rs = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+unicode-segmentation = { workspace = true }
+usvg = { workspace = true }
+xmlwriter = { workspace = true }
 # the long-term plan is to remove the gtk4 dependency entirely after switching to another renderer.
-gtk4 = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
+gtk4 = { workspace = true, optional = true }
 
 [dev-dependencies]
 approx = { workspace = true }
 
 [features]
-default = []
 cli = ["dep:clap"]
+default = []
 ui = ["dep:gtk4"]
diff --git a/crates/rnote-engine/meson.build b/crates/rnote-engine/meson.build
@@ -1,2 +1,2 @@
 subdir('data')
-subdir('src')
+subdir('src')