From 510cef02ca9c86cf26525a6acf4f8e4fa14a20f0 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 10 Mar 2022 14:25:33 +0100 Subject: [PATCH] Run a formatter on all toml files --- eframe/Cargo.toml | 29 +++++++++++++++++++---------- egui-winit/Cargo.toml | 19 ++++++++++--------- egui/Cargo.toml | 9 ++------- egui_demo_app/Cargo.toml | 6 ++++-- egui_demo_lib/Cargo.toml | 28 +++++++++++++++------------- egui_extras/Cargo.toml | 11 ++++------- egui_glium/Cargo.toml | 6 ++++-- egui_glow/Cargo.toml | 9 ++++++--- egui_web/Cargo.toml | 2 +- emath/Cargo.toml | 11 +++-------- epaint/Cargo.toml | 10 +++++----- epi/Cargo.toml | 11 ++++------- 12 files changed, 77 insertions(+), 74 deletions(-) diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml index d091b12eee0..32da7b50067 100644 --- a/eframe/Cargo.toml +++ b/eframe/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/eframe" categories = ["gui", "game-development"] keywords = ["egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -55,18 +50,32 @@ epi = { version = "0.17.0", path = "../epi" } # native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] egui-winit = { version = "0.17.0", path = "../egui-winit", default-features = false } -egui_glium = { version = "0.17.0", path = "../egui_glium", default-features = false, features = ["clipboard", "epi", "links"], optional = true } -egui_glow = { version = "0.17.0", path = "../egui_glow", default-features = false, features = ["clipboard", "epi", "links", "winit"], optional = true } +egui_glium = { version = "0.17.0", path = "../egui_glium", optional = true, default-features = false, features = [ + "clipboard", + "epi", + "links", +] } +egui_glow = { version = "0.17.0", path = "../egui_glow", optional = true, default-features = false, features = [ + "clipboard", + "epi", + "links", + "winit", +] } # web: [target.'cfg(target_arch = "wasm32")'.dependencies] -egui_web = { version = "0.17.0", path = "../egui_web", default-features = false, features = ["glow"] } +egui_web = { version = "0.17.0", path = "../egui_web", default-features = false, features = [ + "glow", +] } [dev-dependencies] # For examples: egui_extras = { path = "../egui_extras", features = ["image", "svg"] } ehttp = "0.2" -image = { version = "0.24", default-features = false, features = ["jpeg", "png"] } +image = { version = "0.24", default-features = false, features = [ + "jpeg", + "png", +] } poll-promise = "0.1" rfd = "0.8" diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index 5410871baaf..1bf48fdad07 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/egui-winit" categories = ["gui", "game-development"] keywords = ["winit", "egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -35,7 +30,10 @@ links = ["webbrowser"] # experimental support for a screen reader screen_reader = ["tts"] -persistence = ["egui/serialize", "serde"] # can't add epi/persistence here because of https://github.com/rust-lang/cargo/issues/8832 +persistence = [ + "egui/serialize", + "serde", +] # can't add epi/persistence here because of https://github.com/rust-lang/cargo/issues/8832 serialize = ["egui/serialize", "serde"] # implement bytemuck on most types. @@ -43,7 +41,10 @@ convert_bytemuck = ["egui/convert_bytemuck"] [dependencies] -egui = { version = "0.17.0", path = "../egui", default-features = false, features = ["single_threaded", "tracing"] } +egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ + "single_threaded", + "tracing", +] } instant = { version = "0.1", features = ["wasm-bindgen"] } tracing = "0.1" winit = "0.26.1" @@ -51,7 +52,7 @@ winit = "0.26.1" epi = { version = "0.17.0", path = "../epi", optional = true } copypasta = { version = "0.7", optional = true } -dark-light = { version = "0.2.1", optional = true } # detect dark mode system preference +dark-light = { version = "0.2.1", optional = true } # detect dark mode system preference serde = { version = "1.0", optional = true, features = ["derive"] } webbrowser = { version = "0.6", optional = true } diff --git a/egui/Cargo.toml b/egui/Cargo.toml index 55e34912eb8..b99087a0b2f 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -11,12 +11,7 @@ readme = "../README.md" repository = "https://github.com/emilk/egui" categories = ["gui", "game-development"] keywords = ["gui", "imgui", "immediate", "portable", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -65,6 +60,6 @@ nohash-hasher = "0.2" # Optional: ron = { version = "0.7", optional = true } -serde = { version = "1", features = ["derive", "rc"], optional = true } +serde = { version = "1", optional = true, features = ["derive", "rc"] } # egui doesn't log much, but when it does, it uses `tracing` tracing = { version = "0.1", optional = true } diff --git a/egui_demo_app/Cargo.toml b/egui_demo_app/Cargo.toml index cf273ac33bf..6bcda1407da 100644 --- a/egui_demo_app/Cargo.toml +++ b/egui_demo_app/Cargo.toml @@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"] default = ["persistence"] http = ["egui_demo_lib/http"] persistence = ["eframe/persistence", "egui_demo_lib/persistence"] -screen_reader = ["eframe/screen_reader"] # experimental +screen_reader = ["eframe/screen_reader"] # experimental syntax_highlighting = ["egui_demo_lib/syntax_highlighting"] @@ -28,7 +28,9 @@ eframe = { version = "0.17.0", path = "../eframe" } # To use the old glium backend instead: # eframe = { version = "0.17.0", path = "../eframe", default-features = false, features = ["default_fonts", "egui_glium"] } -egui_demo_lib = { version = "0.17.0", path = "../egui_demo_lib", features = ["extra_debug_asserts"] } +egui_demo_lib = { version = "0.17.0", path = "../egui_demo_lib", features = [ + "extra_debug_asserts", +] } tracing-subscriber = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/egui_demo_lib/Cargo.toml b/egui_demo_lib/Cargo.toml index c756571c90d..11ff6764500 100644 --- a/egui_demo_lib/Cargo.toml +++ b/egui_demo_lib/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/egui_demo_lib" categories = ["gui", "graphics"] keywords = ["glium", "egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -34,7 +29,7 @@ extra_asserts = ["egui/extra_asserts"] http = ["egui_extras", "ehttp", "image", "poll-promise"] persistence = ["egui/persistence", "epi/persistence", "serde"] -serialize = ["egui/serialize", "serde"] +serialize = ["egui/serialize", "serde"] syntax_highlighting = ["syntect"] @@ -42,21 +37,28 @@ syntax_highlighting = ["syntect"] egui = { version = "0.17.0", path = "../egui", default-features = false } epi = { version = "0.17.0", path = "../epi" } -chrono = { version = "0.4", features = ["js-sys", "wasmbind"], optional = true } +chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] } enum-map = { version = "2", features = ["serde"] } unicode_names2 = { version = "0.5.0", default-features = false } # feature "http": -egui_extras = { version = "0.17.0", path = "../egui_extras", features = ["image"], optional = true } +egui_extras = { version = "0.17.0", path = "../egui_extras", optional = true, features = [ + "image", +] } ehttp = { version = "0.2.0", optional = true } -image = { version = "0.24", default-features = false, features = ["jpeg", "png"], optional = true } -poll-promise = { version = "0.1", default-features = false, optional = true } +image = { version = "0.24", optional = true, default-features = false, features = [ + "jpeg", + "png", +] } +poll-promise = { version = "0.1", optional = true, default-features = false } # feature "syntax_highlighting": -syntect = { version = "4", default-features = false, features = ["default-fancy"], optional = true } +syntect = { version = "4", optional = true, default-features = false, features = [ + "default-fancy", +] } # feature "persistence": -serde = { version = "1", features = ["derive"], optional = true } +serde = { version = "1", optional = true, features = ["derive"] } [dev-dependencies] criterion = { version = "0.3", default-features = false } diff --git a/egui_extras/Cargo.toml b/egui_extras/Cargo.toml index d418ad56463..63c31f96576 100644 --- a/egui_extras/Cargo.toml +++ b/egui_extras/Cargo.toml @@ -11,12 +11,7 @@ readme = "../README.md" repository = "https://github.com/emilk/egui" categories = ["gui", "game-development"] keywords = ["gui", "imgui", "immediate", "portable", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -32,7 +27,9 @@ svg = ["resvg", "tiny-skia", "usvg"] [dependencies] -egui = { version = "0.17.0", path = "../egui", default-features = false, features = ["single_threaded"] } +egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ + "single_threaded", +] } parking_lot = "0.12" # Optional dependencies: diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 56d03b3cbbb..8dbcfbf7abe 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -41,7 +41,7 @@ links = ["egui-winit/links"] persistence = [ "egui-winit/persistence", "egui/persistence", - "epi", # also implied by the lines below, see https://github.com/rust-lang/cargo/issues/8832 + "epi", # also implied by the lines below, see https://github.com/rust-lang/cargo/issues/8832 "epi/file_storage", "epi/persistence", ] @@ -55,7 +55,9 @@ egui = { version = "0.17.0", path = "../egui", default-features = false, feature "convert_bytemuck", "single_threaded", ] } -egui-winit = { version = "0.17.0", path = "../egui-winit", default-features = false, features = ["epi"] } +egui-winit = { version = "0.17.0", path = "../egui-winit", default-features = false, features = [ + "epi", +] } epi = { version = "0.17.0", path = "../epi", optional = true } ahash = "0.7" diff --git a/egui_glow/Cargo.toml b/egui_glow/Cargo.toml index 88ecf06616a..aa6ed64835b 100644 --- a/egui_glow/Cargo.toml +++ b/egui_glow/Cargo.toml @@ -41,7 +41,7 @@ links = ["egui-winit/links"] persistence = [ "egui-winit/persistence", "egui/persistence", - "epi", # also implied by the lines below, see https://github.com/rust-lang/cargo/issues/8832 + "epi", # also implied by the lines below, see https://github.com/rust-lang/cargo/issues/8832 "epi/file_storage", "epi/persistence", ] @@ -67,9 +67,12 @@ memoffset = "0.6" tracing = "0.1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -egui-winit = { version = "0.17.0", path = "../egui-winit", default-features = false, features = ["dark-light", "epi"], optional = true } +egui-winit = { version = "0.17.0", path = "../egui-winit", optional = true, default-features = false, features = [ + "dark-light", + "epi", +] } glutin = { version = "0.28.0", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -web-sys = { version = "0.3", features=["console"] } +web-sys = { version = "0.3", features = ["console"] } wasm-bindgen = { version = "0.2" } diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index 2cb6e1cec69..6ce254cb210 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -52,7 +52,7 @@ egui = { version = "0.17.0", path = "../egui", default-features = false, feature "single_threaded", "tracing", ] } -egui_glow = { version = "0.17.0",path = "../egui_glow", default-features = false, optional = true } +egui_glow = { version = "0.17.0", path = "../egui_glow", optional = true, default-features = false } epi = { version = "0.17.0", path = "../epi" } bytemuck = "1.7" diff --git a/emath/Cargo.toml b/emath/Cargo.toml index 8e2c1c35217..4fd3afc7531 100644 --- a/emath/Cargo.toml +++ b/emath/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/emath" categories = ["mathematics", "gui"] keywords = ["math", "gui"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -34,6 +29,6 @@ extra_asserts = [] [dependencies] -bytemuck = { version = "1.7.2", features = ["derive"], optional = true } +bytemuck = { version = "1.7.2", optional = true, features = ["derive"] } mint = { version = "0.5.6", optional = true } -serde = { version = "1", features = ["derive"], optional = true } +serde = { version = "1", optional = true, features = ["derive"] } diff --git a/epaint/Cargo.toml b/epaint/Cargo.toml index c4348d8b323..4c6ef6a219b 100644 --- a/epaint/Cargo.toml +++ b/epaint/Cargo.toml @@ -58,13 +58,13 @@ multi_threaded = ["parking_lot"] emath = { version = "0.17.0", path = "../emath" } ab_glyph = "0.2.11" -ahash = { version = "0.7", features = ["std"], default-features = false } -atomic_refcell = { version = "0.1", optional = true } # Used instead of parking_lot when you are always using epaint in a single thread. About as fast as parking_lot. Panics on multi-threaded use. -bytemuck = { version = "1.7.2", features = ["derive"], optional = true } +ahash = { version = "0.7", default-features = false, features = ["std"] } +atomic_refcell = { version = "0.1", optional = true } # Used instead of parking_lot when you are always using epaint in a single thread. About as fast as parking_lot. Panics on multi-threaded use. +bytemuck = { version = "1.7.2", optional = true, features = ["derive"] } cint = { version = "^0.2.2", optional = true } nohash-hasher = "0.2" -parking_lot = { version = "0.12", optional = true } # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios. -serde = { version = "1", features = ["derive", "rc"], optional = true } +parking_lot = { version = "0.12", optional = true } # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios. +serde = { version = "1", optional = true, features = ["derive", "rc"] } [dev-dependencies] criterion = { version = "0.3", default-features = false } diff --git a/epi/Cargo.toml b/epi/Cargo.toml index 3efbd38aae8..398e426cedd 100644 --- a/epi/Cargo.toml +++ b/epi/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/epi" categories = ["gui", "game-development"] keywords = ["egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] all-features = true @@ -33,7 +28,9 @@ persistence = ["ron", "serde", "egui/persistence"] [dependencies] -egui = { version = "0.17.0", path = "../egui", default-features = false, features = ["single_threaded"] } +egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ + "single_threaded", +] } tracing = "0.1" directories-next = { version = "2", optional = true }