Use more workspace dependencies (#7596)

Cargo.toml

@@ -71,17 +71,26 @@ eframe = { version = "0.32.3", path = "crates/eframe", default-features = false
 accesskit = "0.21.0"
 accesskit_consumer = "0.30.0"
 accesskit_winit = "0.29"
+ab_glyph = "0.2.11"
 ahash = { version = "0.8.11", default-features = false, features = [
     "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
     "std",
 ] }
+android_logger = "0.14"
+arboard = { version = "3.3", default-features = false}
 backtrace = "0.3"
 bitflags = "2.6"
 bytemuck = "1.23.2"
+chrono = { version = "0.4", default-features = false }
+cint = "0.3.1"
+color-hex = "0.2.0"
 criterion = { version = "0.7", default-features = false }
 dify = { version = "0.7", default-features = false }
 directories = "6"
 document-features = "0.2.10"
+ehttp = { version = "0.5", default-features = false }
+enum-map = "2"
+env_logger = { version = "0.10", default-features = false }
 glow = "0.16"
 glutin = { version = "0.32.0", default-features = false }
 glutin-winit = { version = "0.5.0", default-features = false }
@@ -90,7 +99,10 @@ image = { version = "0.25", default-features = false }
 js-sys = "0.3"
 kittest = { version = "0.2.0", git = "https://github.com/rerun-io/kittest.git" }
 log = { version = "0.4", features = ["std"] }
+memoffset = "0.9"
 mimalloc = "0.1.46"
+mime_guess2 = { version = "2", default-features = false }
+mint = "0.5.6"
 nohash-hasher = "0.2"
 objc2 = "0.5.1"
 objc2-app-kit = { version = "0.2.0", default-features = false }
@@ -99,28 +111,40 @@ objc2-ui-kit = { version = "0.2.0", default-features = false }
 open = "5"
 parking_lot = "0.12"
 percent-encoding = "2.1"
+poll-promise = { version = "0.3", default-features = false }
 pollster = "0.4"
 profiling = { version = "1.0.16", default-features = false }
 puffin = "0.19"
 puffin_http = "0.16"
+rand = "0.9"
 raw-window-handle = "0.6.0"
+rayon = "1.7"
+resvg = { version = "0.45", default-features = false }
+rfd = "0.15.3"
 ron = "0.11"
 serde = { version = "1", features = ["derive"] }
 similar-asserts = "1.4.2"
 smallvec = "1"
+smithay-clipboard =  "0.7.2"
 static_assertions = "1.1.0"
+syntect = { version = "5", default-features = false }
 tempfile = "3"
 thiserror = "1.0.37"
+tokio = "1"
 type-map = "0.5.0"
+unicode_names2 = { version = "0.6.0", default-features = false }
 unicode-segmentation = "1.12.0"
-wasm-bindgen = "0.2"
+wasm-bindgen = "=0.2.100"
 wasm-bindgen-futures = "0.4"
+wayland-cursor = { version = "0.31.1", default-features = false }
 web-sys = "0.3.73"
 web-time = "1.1.0" # Timekeeping for native and web
+webbrowser = "1.0.0"
 wgpu = { version = "27.0.0", default-features = false, features = ["std"] }
 windows-sys = "0.60"
 winit = { version = "0.30.12", default-features = false }
 
+
 [workspace.lints.rust]
 unsafe_code = "deny"
 

crates/ecolor/Cargo.toml

@@ -39,10 +39,10 @@ emath.workspace = true
 bytemuck = { workspace = true, optional = true, features = ["derive"] }
 
 ## [`cint`](https://docs.rs/cint) enables interoperability with other color libraries.
-cint = { version = "0.3.1", optional = true }
+cint = { workspace = true, optional = true }
 
 ## Enable the [`hex_color`] macro.
-color-hex = { version = "0.2.0", optional = true }
+color-hex = { workspace = true, optional = true }
 
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }

crates/egui-winit/Cargo.toml

@@ -74,14 +74,11 @@ bytemuck = { workspace = true, optional = true }
 document-features = { workspace = true, optional = true }
 
 serde = { workspace = true, optional = true }
-webbrowser = { version = "1.0.0", optional = true }
+webbrowser = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-objc2 = { workspace = true }
+objc2.workspace = true
-objc2-foundation = { workspace = true, features = [
+objc2-foundation = { workspace = true, features = ["std", "NSThread"] }
-  "std",
-  "NSThread",
-] }
 objc2-ui-kit = { workspace = true, features = [
   "std",
   "UIApplication",
@@ -95,14 +92,14 @@ objc2-ui-kit = { workspace = true, features = [
 ] }
 
 [target.'cfg(any(target_os="linux", target_os="dragonfly", target_os="freebsd", target_os="netbsd", target_os="openbsd"))'.dependencies]
-smithay-clipboard = { version = "0.7.2", optional = true }
+smithay-clipboard = { workspace = true, optional = true }
 
 # The wayland-cursor normally selected doesn't properly enable all the features it uses
 # and thus doesn't compile as it is used in egui-winit. This is fixed upstream, so force
 # a slightly newer version. Remove this when winit upgrades past this version.
-wayland-cursor = { version = "0.31.1", default-features = false, optional = true }
+wayland-cursor = { workspace = true, optional = true }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-arboard = { version = "3.3", optional = true, default-features = false, features = [
+arboard = { workspace = true, optional = true, features = [
-    "image-data",
+  "image-data",
 ] }

crates/egui_demo_app/Cargo.toml

@@ -47,10 +47,7 @@ wayland = ["eframe/wayland"]
 x11 = ["eframe/x11"]
 
 [dependencies]
-chrono = { version = "0.4", default-features = false, features = [
+chrono = { workspace = true, features = ["js-sys", "wasmbind"] }
-  "js-sys",
-  "wasmbind",
-] }
 eframe = { workspace = true, default-features = false, features = [
   "web_screen_reader",
 ] }
@@ -80,8 +77,8 @@ wgpu = { workspace = true, features = [
 
 
 # feature "http":
-ehttp = { version = "0.5", optional = true }
+ehttp = { workspace = true, optional = true }
-poll-promise = { version = "0.3", optional = true, default-features = false }
+poll-promise = { workspace = true, optional = true }
 
 # feature "persistence":
 serde = { workspace = true, optional = true }
@@ -89,16 +86,13 @@ serde = { workspace = true, optional = true }
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-  "auto-color",
-  "humantime",
-] }
 mimalloc.workspace = true
-rfd = { version = "0.15.3", optional = true }
+rfd = { workspace = true, optional = true }
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "=0.2.100"
+wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
 web-sys.workspace = true
 

crates/egui_demo_lib/Cargo.toml

@@ -45,10 +45,10 @@ syntect = ["egui_extras/syntect"]
 egui = { workspace = true, default-features = false, features = ["color-hex"] }
 egui_extras = { workspace = true, features = ["image", "svg"] }
 
-unicode_names2 = { version = "0.6.0", default-features = false } # this old version has fewer dependencies
+unicode_names2.workspace = true # this old version has fewer dependencies
 
 #! ### Optional dependencies
-chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] }
+chrono = { workspace = true, optional = true, features = ["js-sys", "wasmbind"] }
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
@@ -61,7 +61,7 @@ egui_extras = { workspace = true, features = ["image", "svg"] }
 egui_kittest = { workspace = true, features = ["wgpu", "snapshot"] }
 image = { workspace = true, features = ["png"] }
 mimalloc.workspace = true                                            # for benchmarks
-rand = "0.9"
+rand.workspace = true
 
 [[bench]]
 name = "benchmark"

crates/egui_extras/Cargo.toml

@@ -73,7 +73,7 @@ syntect = ["dep:syntect"]
 egui = { workspace = true, default-features = false }
 
 ahash.workspace = true
-enum-map = "2"
+enum-map.workspace = true
 log.workspace = true
 profiling.workspace = true
 
@@ -83,7 +83,7 @@ profiling.workspace = true
 serde = { workspace = true, optional = true }
 
 # Date operations needed for datepicker widget
-chrono = { version = "0.4", optional = true, default-features = false, features = [
+chrono = { workspace = true, optional = true, features = [
   "clock",
   "js-sys",
   "std",
@@ -96,15 +96,13 @@ document-features = { workspace = true, optional = true }
 image = { workspace = true, optional = true }
 
 # file feature
-mime_guess2 = { version = "2", optional = true, default-features = false }
+mime_guess2 = { workspace = true, optional = true }
 
-
+# syntax highlighting
-syntect = { version = "5", optional = true, default-features = false, features = [
+syntect = { workspace = true, optional = true, features = ["default-fancy"] }
-  "default-fancy",
-] }
 
 # svg feature
-resvg = { version = "0.45", optional = true, default-features = false }
+resvg = { workspace = true, optional = true }
 
 # http feature
-ehttp = { version = "0.5", optional = true, default-features = false }
+ehttp = { workspace = true, optional = true }

crates/egui_glow/Cargo.toml

@@ -56,7 +56,7 @@ egui-winit = { workspace = true, optional = true, default-features = false }
 bytemuck.workspace = true
 glow.workspace = true
 log.workspace = true
-memoffset = "0.9"
+memoffset.workspace = true
 profiling.workspace = true
 
 #! ### Optional dependencies

crates/emath/Cargo.toml

@@ -37,7 +37,7 @@ bytemuck = { workspace = true, optional = true, features = ["derive"] }
 document-features = { workspace = true, optional = true }
 
 ## [`mint`](https://docs.rs/mint) enables interoperability with other math libraries such as [`glam`](https://docs.rs/glam) and [`nalgebra`](https://docs.rs/nalgebra).
-mint = { version = "0.5.6", optional = true }
+mint = { workspace = true, optional = true }
 
 ## Allow serialization using [`serde`](https://docs.rs/serde).
 serde = { workspace = true, optional = true }

crates/epaint/Cargo.toml

@@ -66,7 +66,7 @@ _override_unity = []
 emath.workspace = true
 ecolor.workspace = true
 
-ab_glyph = "0.2.11"
+ab_glyph.workspace = true
 ahash.workspace = true
 log.workspace = true
 nohash-hasher.workspace = true
@@ -79,7 +79,7 @@ bytemuck = { workspace = true, optional = true, features = ["derive"] }
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }
 
-rayon = { version = "1.7", optional = true }
+rayon = { workspace = true, optional = true }
 
 ## Allow serialization using [`serde`](https://docs.rs/serde) .
 serde = { workspace = true, optional = true, features = ["derive", "rc"] }

examples/confirm_exit/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/custom_3d_glow/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/custom_font/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/custom_font_style/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/custom_keypad/Cargo.toml

@@ -20,7 +20,4 @@ eframe = { workspace = true, features = [
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/custom_style/Cargo.toml

@@ -19,10 +19,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 egui_demo_lib.workspace = true
 egui_extras = { workspace = true, features = ["image"] }
 image = { workspace = true, features = ["png"] }

examples/custom_window_frame/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/external_eventloop/Cargo.toml

@@ -17,9 +17,6 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 
-winit = { workspace = true }
+winit.workspace = true

examples/external_eventloop_async/Cargo.toml

@@ -23,13 +23,10 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 
-log = { workspace = true }
+log.workspace = true
 
-winit = { workspace = true }
+winit.workspace = true
 
-tokio = { version = "1", features = ["rt", "time", "net"] }
+tokio = { workspace = true, features = ["rt", "time", "net"] }

examples/file_dialog/Cargo.toml

@@ -16,8 +16,5 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
+rfd.workspace = true
-    "humantime",
-] }
-rfd = "0.15.3"

examples/hello_android/Cargo.toml

@@ -27,9 +27,9 @@ egui_demo_lib = { workspace = true, features = ["chrono"] }
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
 
-log = { workspace = true }
+android_logger.workspace = true
-winit = { workspace = true }
+log.workspace = true
-android_logger = "0.14"
+winit.workspace = true
 
 [package.metadata.android]
 build_targets = ["armv7-linux-androideabi", "aarch64-linux-android"]

examples/hello_world/Cargo.toml

@@ -20,7 +20,4 @@ eframe = { workspace = true, features = [
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/hello_world_par/Cargo.toml

@@ -23,10 +23,7 @@ eframe = { workspace = true, default-features = false, features = [
     "x11",
     "wgpu",
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 # This is normally enabled by eframe/default, which is not being used here
 # because of accesskit, as mentioned above
 winit = { workspace = true, features = ["default"] }

examples/hello_world_simple/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/images/Cargo.toml

@@ -21,8 +21,5 @@ eframe = { workspace = true, features = [
   "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 egui_extras = { workspace = true, features = ["default", "all_loaders"] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-  "auto-color",
-  "humantime",
-] }
 image = { workspace = true, features = ["jpeg", "png"] }

examples/keyboard_events/Cargo.toml

@@ -16,7 +16,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/multiple_viewports/Cargo.toml

@@ -18,7 +18,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

examples/popups/Cargo.toml

@@ -12,10 +12,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 
 
 [lints]

examples/puffin_profiler/Cargo.toml

@@ -23,11 +23,8 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
+log.workspace = true
-    "humantime",
+puffin.workspace = true
-] }
+puffin_http.workspace = true
-log = { workspace = true }
-puffin = "0.19"
-puffin_http = "0.16"
 profiling = { workspace = true, features = ["profile-with-puffin"] }

examples/screenshot/Cargo.toml

@@ -20,8 +20,5 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
     "wgpu",
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }
 image = { workspace = true, features = ["png"] }

examples/serial_windows/Cargo.toml

@@ -16,8 +16,5 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
+log.workspace = true
-    "humantime",
-] }
-log = { workspace = true }

examples/user_attention/Cargo.toml

@@ -15,7 +15,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

tests/test_egui_extras_compilation/Cargo.toml

@@ -17,4 +17,4 @@ ignored = [
 
 [dependencies]
 eframe = { workspace = true, features = ["default", "persistence"] }
-egui_extras = { workspace = true }
+egui_extras.workspace = true

tests/test_inline_glow_paint/Cargo.toml

@@ -17,7 +17,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

tests/test_size_pass/Cargo.toml

@@ -18,7 +18,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }

tests/test_ui_stack/Cargo.toml

@@ -21,7 +21,4 @@ eframe = { workspace = true, features = [
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image", "serde"] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-  "auto-color",
-  "humantime",
-] }

tests/test_viewports/Cargo.toml

@@ -18,7 +18,4 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { workspace = true, features = ["auto-color", "humantime"] }
-    "auto-color",
-    "humantime",
-] }