diff --git a/.typos.toml b/.typos.toml index d4c71617..7a243a3f 100644 --- a/.typos.toml +++ b/.typos.toml @@ -3,10 +3,10 @@ # run: typos [default.extend-words] -ime = "ime" # Input Method Editor +ime = "ime" # Input Method Editor nknown = "nknown" # part of @55nknown username -ro = "ro" # read-only, also part of the username @Phen-Ro -typ = "typ" # Often used because `type` is a keyword in Rust +ro = "ro" # read-only, also part of the username @Phen-Ro +typ = "typ" # Often used because `type` is a keyword in Rust # I mistype these so often tesalator = "tessellator" @@ -146,5 +146,5 @@ extend-exclude = ["web_demo/egui_demo_app.js"] # auto-generated [default] extend-ignore-re = [ - "#\\[doc\\(alias = .*", # We suggest "grey" in some doc + "#\\[doc\\(alias = .*", # We suggest "grey" in some doc ] diff --git a/Cargo.toml b/Cargo.toml index 35ca02fa..46ae967a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,23 @@ [workspace] resolver = "2" members = [ - "crates/ecolor", - "crates/egui_demo_app", - "crates/egui_demo_lib", - "crates/egui_extras", - "crates/egui_glow", - "crates/egui_kittest", - "crates/egui-wgpu", - "crates/egui-winit", - "crates/egui", - "crates/emath", - "crates/epaint", - "crates/epaint_default_fonts", + "crates/ecolor", + "crates/egui_demo_app", + "crates/egui_demo_lib", + "crates/egui_extras", + "crates/egui_glow", + "crates/egui_kittest", + "crates/egui-wgpu", + "crates/egui-winit", + "crates/egui", + "crates/emath", + "crates/epaint", + "crates/epaint_default_fonts", - "examples/*", - "tests/*", + "examples/*", + "tests/*", - "xtask", + "xtask", ] [workspace.package] @@ -73,11 +73,11 @@ accesskit_consumer = "0.30.1" accesskit_winit = "0.29.1" ab_glyph = "0.2.32" ahash = { version = "0.8.12", default-features = false, features = [ - "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead - "std", + "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead + "std", ] } android_logger = "0.15.1" -arboard = { version = "3.6.1", default-features = false} +arboard = { version = "3.6.1", default-features = false } backtrace = "0.3.76" bitflags = "2.9.4" bytemuck = "1.24.0" @@ -125,7 +125,7 @@ ron = "0.11.0" serde = { version = "1.0.228", features = ["derive"] } similar-asserts = "1.7.0" smallvec = "1.15.1" -smithay-clipboard = "0.7.2" +smithay-clipboard = "0.7.2" static_assertions = "1.1.0" syntect = { version = "5.3.0", default-features = false } tempfile = "3.23.0" @@ -134,7 +134,7 @@ tokio = "1.47.1" type-map = "0.5.1" unicode_names2 = { version = "2.0.0", default-features = false } unicode-segmentation = "1.12.0" -wasm-bindgen = "0.2.100" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml +wasm-bindgen = "0.2.100" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml wasm-bindgen-futures = "0.4.0" wayland-cursor = { version = "0.31.11", default-features = false } web-sys = "0.3.77" @@ -156,7 +156,7 @@ rust_2021_prelude_collisions = "warn" semicolon_in_expressions_from_macros = "warn" trivial_numeric_casts = "warn" unexpected_cfgs = "warn" -unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668 +unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668 unused_extern_crates = "warn" unused_import_braces = "warn" unused_lifetimes = "warn" @@ -186,11 +186,11 @@ dbg_macro = "warn" debug_assert_with_mut_call = "warn" default_union_representation = "warn" derive_partial_eq_without_eq = "warn" -disallowed_macros = "warn" # See clippy.toml -disallowed_methods = "warn" # See clippy.toml -disallowed_names = "warn" # See clippy.toml -disallowed_script_idents = "warn" # See clippy.toml -disallowed_types = "warn" # See clippy.toml +disallowed_macros = "warn" # See clippy.toml +disallowed_methods = "warn" # See clippy.toml +disallowed_names = "warn" # See clippy.toml +disallowed_script_idents = "warn" # See clippy.toml +disallowed_types = "warn" # See clippy.toml doc_comment_double_space_linebreaks = "warn" doc_link_with_quotes = "warn" doc_markdown = "warn" @@ -345,14 +345,14 @@ zero_sized_map_values = "warn" comparison_chain = "allow" should_panic_without_expect = "allow" too_many_lines = "allow" -unwrap_used = "allow" # TODO(emilk): We really wanna warn on this one +unwrap_used = "allow" # TODO(emilk): We really wanna warn on this one # These are meh: -assigning_clones = "allow" # No please +assigning_clones = "allow" # No please let_underscore_must_use = "allow" let_underscore_untyped = "allow" -manual_range_contains = "allow" # this one is just worse imho -map_unwrap_or = "allow" # so is this one -self_named_module_files = "allow" # Disabled waiting on https://github.com/rust-lang/rust-clippy/issues/9602 +manual_range_contains = "allow" # this one is just worse imho +map_unwrap_or = "allow" # so is this one +self_named_module_files = "allow" # Disabled waiting on https://github.com/rust-lang/rust-clippy/issues/9602 significant_drop_tightening = "allow" # Too many false positives -wildcard_imports = "allow" # `use crate::*` is useful to avoid merge conflicts when adding/removing imports +wildcard_imports = "allow" # `use crate::*` is useful to avoid merge conflicts when adding/removing imports diff --git a/clippy.toml b/clippy.toml index 9ce15103..6602fbc6 100644 --- a/clippy.toml +++ b/clippy.toml @@ -23,25 +23,25 @@ type-complexity-threshold = 350 # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_macros disallowed-macros = [ - 'std::dbg', - 'std::unimplemented', + 'std::dbg', + 'std::unimplemented', - # TODO(emilk): consider forbidding these to encourage the use of proper log stream, and then explicitly allow legitimate uses - # 'std::eprint', - # 'std::eprintln', - # 'std::print', - # 'std::println', + # TODO(emilk): consider forbidding these to encourage the use of proper log stream, and then explicitly allow legitimate uses + # 'std::eprint', + # 'std::eprintln', + # 'std::print', + # 'std::println', ] # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_methods disallowed-methods = [ - # NOTE: There are many things that aren't allowed on wasm, - # but we cannot disable them all here (because of e.g. https://github.com/rust-lang/rust-clippy/issues/10406) - # so we do that in `clipppy_wasm.toml` instead. + # NOTE: There are many things that aren't allowed on wasm, + # but we cannot disable them all here (because of e.g. https://github.com/rust-lang/rust-clippy/issues/10406) + # so we do that in `clipppy_wasm.toml` instead. - { path = "std::env::temp_dir", readon = "Use the tempfile crate instead" }, - { path = "std::panic::catch_unwind", reason = "We compile with `panic = abort" }, - { path = "std::thread::spawn", readon = "Use `std::thread::Builder` and name the thread" }, + { path = "std::env::temp_dir", readon = "Use the tempfile crate instead" }, + { path = "std::panic::catch_unwind", reason = "We compile with `panic = abort" }, + { path = "std::thread::spawn", readon = "Use `std::thread::Builder` and name the thread" }, ] # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names @@ -49,24 +49,24 @@ disallowed-names = [] # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_types disallowed-types = [ - { path = "std::sync::Condvar", reason = "Use parking_lot instead" }, - { path = "std::sync::Mutex", reason = "Use epaint::mutex instead" }, - { path = "std::sync::RwLock", reason = "Use epaint::mutex instead" }, - { path = "winit::dpi::LogicalPosition", reason = "We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account" }, - { path = "winit::dpi::LogicalSize", reason = "We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account" }, - # "std::sync::Once", # enabled for now as the `log_once` macro uses it internally + { path = "std::sync::Condvar", reason = "Use parking_lot instead" }, + { path = "std::sync::Mutex", reason = "Use epaint::mutex instead" }, + { path = "std::sync::RwLock", reason = "Use epaint::mutex instead" }, + { path = "winit::dpi::LogicalPosition", reason = "We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account" }, + { path = "winit::dpi::LogicalSize", reason = "We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account" }, + # "std::sync::Once", # enabled for now as the `log_once` macro uses it internally ] # ----------------------------------------------------------------------------- # Allow-list of words for markdown in docstrings https://rust-lang.github.io/rust-clippy/master/index.html#doc_markdown doc-valid-idents = [ - # You must also update the same list in `scripts/clippy_wasm/clippy.toml`! - "AccessKit", - "WebGL", - "WebGL1", - "WebGL2", - "WebGPU", - "VirtualBox", - "..", + # You must also update the same list in `scripts/clippy_wasm/clippy.toml`! + "AccessKit", + "WebGL", + "WebGL1", + "WebGL2", + "WebGPU", + "VirtualBox", + "..", ] diff --git a/crates/ecolor/Cargo.toml b/crates/ecolor/Cargo.toml index e8db84b3..f37aff10 100644 --- a/crates/ecolor/Cargo.toml +++ b/crates/ecolor/Cargo.toml @@ -1,10 +1,7 @@ [package] name = "ecolor" version.workspace = true -authors = [ - "Emil Ernerfeldt ", - "Andreas Reich ", -] +authors = ["Emil Ernerfeldt ", "Andreas Reich "] description = "Color structs and color conversion utilities" edition.workspace = true rust-version.workspace = true diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 7fd3b9e3..ce2103cc 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -11,13 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/main/crates/eframe" categories = ["gui", "game-development"] keywords = ["egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", - "data/icon.png", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/icon.png"] [package.metadata.docs.rs] all-features = true @@ -35,7 +29,7 @@ default = [ "accesskit", "default_fonts", "glow", - "wayland", # Required for Linux support (including CI!) + "wayland", # Required for Linux support (including CI!) "web_screen_reader", "winit/default", "x11", @@ -66,13 +60,7 @@ default_fonts = ["egui/default_fonts"] glow = ["dep:egui_glow", "dep:glow", "dep:glutin-winit", "dep:glutin"] ## Enable saving app state to disk. -persistence = [ - "dep:home", - "egui-winit/serde", - "egui/persistence", - "ron", - "serde", -] +persistence = ["dep:home", "egui-winit/serde", "egui/persistence", "ron", "serde"] ## Enables wayland support and fixes clipboard issue. ## @@ -88,10 +76,7 @@ wayland = [ ## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web. ## ## For other platforms, use the `accesskit` feature instead. -web_screen_reader = [ - "web-sys/SpeechSynthesis", - "web-sys/SpeechSynthesisUtterance", -] +web_screen_reader = ["web-sys/SpeechSynthesis", "web-sys/SpeechSynthesisUtterance"] ## Use [`wgpu`](https://docs.rs/wgpu) for painting (via [`egui-wgpu`](https://github.com/emilk/egui/tree/main/crates/egui-wgpu)). ## @@ -145,10 +130,7 @@ serde = { workspace = true, optional = true } # ------------------------------------------- # native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -egui-winit = { workspace = true, default-features = false, features = [ - "clipboard", - "links", -] } +egui-winit = { workspace = true, default-features = false, features = ["clipboard", "links"] } image = { workspace = true, features = ["png"] } # Needed for app icon winit = { workspace = true, default-features = false, features = ["rwh_06"] } @@ -158,10 +140,7 @@ egui-wgpu = { workspace = true, optional = true, features = [ ] } # if wgpu is used, use it with winit pollster = { workspace = true, optional = true } # needed for wgpu -glutin = { workspace = true, optional = true, default-features = false, features = [ - "egl", - "wgl", -] } +glutin = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] } glutin-winit = { workspace = true, optional = true, default-features = false, features = [ "egl", "wgl", diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index 94189f90..88321e65 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -15,13 +15,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/main/crates/egui-wgpu" categories = ["gui", "game-development"] keywords = ["wgpu", "egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "**/*.wgsl", - "Cargo.toml", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "**/*.wgsl", "Cargo.toml"] [lints] workspace = true diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 45e5fa51..a4c84b05 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -100,6 +100,4 @@ smithay-clipboard = { workspace = true, optional = true } wayland-cursor = { workspace = true, optional = true } [target.'cfg(not(target_os = "android"))'.dependencies] -arboard = { workspace = true, optional = true, features = [ - "image-data", -] } +arboard = { workspace = true, optional = true, features = ["image-data"] } diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index aac086e1..8eb441ac 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -31,12 +31,7 @@ web_app = ["http", "persistence"] accessibility_inspector = ["dep:accesskit", "dep:accesskit_consumer", "eframe/accesskit"] http = ["ehttp", "image/jpeg", "poll-promise", "egui_extras/image"] image_viewer = ["image/jpeg", "egui_extras/all_loaders", "rfd"] -persistence = [ - "eframe/persistence", - "egui_extras/serde", - "egui/persistence", - "serde", -] +persistence = ["eframe/persistence", "egui_extras/serde", "egui/persistence", "serde"] puffin = ["dep:puffin", "dep:puffin_http", "profiling/profile-with-puffin"] serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"] syntect = ["egui_demo_lib/syntect"] @@ -48,9 +43,7 @@ x11 = ["eframe/x11"] [dependencies] chrono = { workspace = true, features = ["js-sys", "wasmbind"] } -eframe = { workspace = true, default-features = false, features = [ - "web_screen_reader", -] } +eframe = { workspace = true, default-features = false, features = ["web_screen_reader"] } egui = { workspace = true, features = ["callstack", "default"] } egui_demo_lib = { workspace = true, features = ["default", "chrono"] } egui_extras = { workspace = true, features = ["default", "image"] } @@ -69,11 +62,7 @@ puffin = { workspace = true, optional = true } puffin_http = { workspace = true, optional = true } # Enable both WebGL & WebGPU when targeting the web (these features have no effect when not targeting wasm32) # Also enable the default features so we have a supported backend for every platform. -wgpu = { workspace = true, features = [ - "default", - "webgpu", - "webgl", -], optional = true } +wgpu = { workspace = true, features = ["default", "webgpu", "webgl"], optional = true } # feature "http": diff --git a/crates/egui_demo_lib/Cargo.toml b/crates/egui_demo_lib/Cargo.toml index 6d1473ea..3e61187d 100644 --- a/crates/egui_demo_lib/Cargo.toml +++ b/crates/egui_demo_lib/Cargo.toml @@ -11,13 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/main/crates/egui_demo_lib" categories = ["gui", "graphics"] keywords = ["glow", "egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", - "data/*", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/*"] [lints] workspace = true @@ -60,7 +54,7 @@ egui = { workspace = true, features = ["default_fonts"] } egui_extras = { workspace = true, features = ["image", "svg"] } egui_kittest = { workspace = true, features = ["wgpu", "snapshot"] } image = { workspace = true, features = ["png"] } -mimalloc.workspace = true # for benchmarks +mimalloc.workspace = true # for benchmarks rand.workspace = true [[bench]] diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml index b53d3f07..6639126e 100644 --- a/crates/egui_extras/Cargo.toml +++ b/crates/egui_extras/Cargo.toml @@ -83,12 +83,7 @@ profiling.workspace = true serde = { workspace = true, optional = true } # Date operations needed for datepicker widget -chrono = { workspace = true, optional = true, features = [ - "clock", - "js-sys", - "std", - "wasmbind", -] } +chrono = { workspace = true, optional = true, features = ["clock", "js-sys", "std", "wasmbind"] } ## Enable this when generating docs. document-features = { workspace = true, optional = true } diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index 30e74d22..4a083611 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -11,13 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/main/crates/egui_glow" categories = ["gui", "game-development"] keywords = ["glow", "egui", "gui", "gamedev"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml", - "src/shader/*.glsl", -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "src/shader/*.glsl"] [lints] workspace = true @@ -73,7 +67,7 @@ wasm-bindgen.workspace = true [dev-dependencies] -glutin = { workspace = true, default-features = true } # examples/pure_glow +glutin = { workspace = true, default-features = true } # examples/pure_glow glutin-winit = { workspace = true, default-features = true } [[example]] diff --git a/crates/egui_kittest/Cargo.toml b/crates/egui_kittest/Cargo.toml index 56ba13b9..c283d073 100644 --- a/crates/egui_kittest/Cargo.toml +++ b/crates/egui_kittest/Cargo.toml @@ -1,10 +1,7 @@ [package] name = "egui_kittest" version.workspace = true -authors = [ - "Lucas Meurer ", - "Emil Ernerfeldt ", -] +authors = ["Lucas Meurer ", "Emil Ernerfeldt "] description = "Testing library for egui based on kittest and AccessKit" edition.workspace = true rust-version.workspace = true @@ -24,13 +21,7 @@ rustdoc-args = ["--generate-link-to-definition"] [features] ## Adds a wgpu-based test renderer. -wgpu = [ - "dep:egui-wgpu", - "dep:pollster", - "dep:image", - "dep:wgpu", - "eframe?/wgpu", -] +wgpu = ["dep:egui-wgpu", "dep:pollster", "dep:image", "dep:wgpu", "eframe?/wgpu"] ## Adds a dify-based image snapshot utility. snapshot = ["dep:dify", "dep:image", "dep:open", "dep:tempfile", "image/png"] @@ -52,12 +43,7 @@ egui-wgpu = { workspace = true, optional = true } pollster = { workspace = true, optional = true } image = { workspace = true, optional = true } # Enable DX12 because it always comes with a software rasterizer. -wgpu = { workspace = true, features = [ - "metal", - "dx12", - "vulkan", - "gles", -], optional = true } +wgpu = { workspace = true, features = ["metal", "dx12", "vulkan", "gles"], optional = true } # snapshot dependencies dify = { workspace = true, optional = true } diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml index d287ffb3..3ac99a97 100644 --- a/crates/epaint/Cargo.toml +++ b/crates/epaint/Cargo.toml @@ -11,12 +11,7 @@ readme = "README.md" repository = "https://github.com/emilk/egui/tree/main/crates/epaint" categories = ["graphics", "gui"] keywords = ["graphics", "gui", "egui"] -include = [ - "../LICENSE-APACHE", - "../LICENSE-MIT", - "**/*.rs", - "Cargo.toml" -] +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [lints] workspace = true @@ -70,8 +65,8 @@ ab_glyph.workspace = true ahash.workspace = true log.workspace = true nohash-hasher.workspace = true -parking_lot.workspace = true # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios. -profiling = { workspace = true} +parking_lot.workspace = true # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios. +profiling = { workspace = true } #! ### Optional dependencies bytemuck = { workspace = true, optional = true, features = ["derive"] } diff --git a/deny.toml b/deny.toml index a2953d31..c7206ff2 100644 --- a/deny.toml +++ b/deny.toml @@ -45,24 +45,24 @@ deny = [ ] skip = [ - { name = "bit-set" }, # wgpu's naga depends on 0.8, syntect's (used by egui_extras) fancy-regex depends on 0.5 - { name = "bit-vec" }, # dependency of bit-set in turn, different between 0.6 and 0.5 - { name = "bitflags" }, # old 1.0 version via glutin, png, spirv, … - { name = "core-foundation" }, # version conflict between winit and wgpu ecosystems + { name = "bit-set" }, # wgpu's naga depends on 0.8, syntect's (used by egui_extras) fancy-regex depends on 0.5 + { name = "bit-vec" }, # dependency of bit-set in turn, different between 0.6 and 0.5 + { name = "bitflags" }, # old 1.0 version via glutin, png, spirv, … + { name = "core-foundation" }, # version conflict between winit and wgpu ecosystems { name = "core-graphics-types" }, # version conflict between winit and wgpu ecosystems - { name = "getrandom" }, # ring / rustls (and thus ehttp) still depend on getrandom 0.2 - { name = "quick-xml" }, # old version via wayland-scanner - { name = "redox_syscall" }, # old version via winit - { name = "rustc-hash" }, # Small enough - { name = "thiserror" }, # ecosystem is in the process of migrating from 1.x to 2.x - { name = "thiserror-impl" }, # same as above - { name = "windows-sys" }, # mostly hopeless to avoid - { name = "zerocopy" }, # Small enough + { name = "getrandom" }, # ring / rustls (and thus ehttp) still depend on getrandom 0.2 + { name = "quick-xml" }, # old version via wayland-scanner + { name = "redox_syscall" }, # old version via winit + { name = "rustc-hash" }, # Small enough + { name = "thiserror" }, # ecosystem is in the process of migrating from 1.x to 2.x + { name = "thiserror-impl" }, # same as above + { name = "windows-sys" }, # mostly hopeless to avoid + { name = "zerocopy" }, # Small enough ] skip-tree = [ { name = "hashbrown" }, # wgpu's naga depends on 0.16, accesskit depends on 0.15 - { name = "rfd" }, # example dependency - { name = "windows" }, # the ecosystem is currently transitioning from 0.58 to 0.61 + { name = "rfd" }, # example dependency + { name = "windows" }, # the ecosystem is currently transitioning from 0.58 to 0.61 ] @@ -72,21 +72,21 @@ private = { ignore = true } confidence-threshold = 0.93 # We want really high confidence when inferring licenses from text allow = [ "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html - "Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0) - "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd) - "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised) - "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained - "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ - "ISC", # https://www.tldrlegal.com/license/isc-license - "MIT-0", # https://choosealicense.com/licenses/mit-0/ - "MIT", # https://tldrlegal.com/license/mit-license - "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux. - "OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html - "OpenSSL", # https://www.openssl.org/source/license.html - used on Linux - "Ubuntu-font-1.0", # https://ubuntu.com/legal/font-licence - "Unicode-3.0", # https://www.unicode.org/license.txt - "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html - "Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib) + "Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0) + "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd) + "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised) + "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained + "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ + "ISC", # https://www.tldrlegal.com/license/isc-license + "MIT-0", # https://choosealicense.com/licenses/mit-0/ + "MIT", # https://tldrlegal.com/license/mit-license + "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux. + "OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html + "OpenSSL", # https://www.openssl.org/source/license.html - used on Linux + "Ubuntu-font-1.0", # https://ubuntu.com/legal/font-licence + "Unicode-3.0", # https://www.unicode.org/license.txt + "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html + "Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib) ] exceptions = [] diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml index 087f801a..2724ae07 100644 --- a/examples/confirm_exit/Cargo.toml +++ b/examples/confirm_exit/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml index 9a172825..8636b0f4 100644 --- a/examples/custom_3d_glow/Cargo.toml +++ b/examples/custom_3d_glow/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml index 4de7d16b..b10bd12c 100644 --- a/examples/custom_font/Cargo.toml +++ b/examples/custom_font/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml index 1f334339..373225f6 100644 --- a/examples/custom_font_style/Cargo.toml +++ b/examples/custom_font_style/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/custom_keypad/Cargo.toml b/examples/custom_keypad/Cargo.toml index e5a7f696..6c3cd0f2 100644 --- a/examples/custom_keypad/Cargo.toml +++ b/examples/custom_keypad/Cargo.toml @@ -13,8 +13,8 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } # For image support: diff --git a/examples/custom_style/Cargo.toml b/examples/custom_style/Cargo.toml index 5bbd93c8..d4f874e9 100644 --- a/examples/custom_style/Cargo.toml +++ b/examples/custom_style/Cargo.toml @@ -16,8 +16,8 @@ ignored = ["image"] # We need the .png feature [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } egui_demo_lib.workspace = true diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml index 7dc1c701..45389358 100644 --- a/examples/custom_window_frame/Cargo.toml +++ b/examples/custom_window_frame/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/external_eventloop/Cargo.toml b/examples/external_eventloop/Cargo.toml index c26d5ea9..d54d1b1c 100644 --- a/examples/external_eventloop/Cargo.toml +++ b/examples/external_eventloop/Cargo.toml @@ -13,8 +13,8 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/external_eventloop_async/Cargo.toml b/examples/external_eventloop_async/Cargo.toml index ad9d3099..c0537b10 100644 --- a/examples/external_eventloop_async/Cargo.toml +++ b/examples/external_eventloop_async/Cargo.toml @@ -19,8 +19,8 @@ required-features = ["linux-example"] [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml index 1fe1f64c..a3b5318b 100644 --- a/examples/file_dialog/Cargo.toml +++ b/examples/file_dialog/Cargo.toml @@ -13,8 +13,8 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } rfd.workspace = true diff --git a/examples/hello_android/Cargo.toml b/examples/hello_android/Cargo.toml index 880a7d7c..c4b5a93f 100644 --- a/examples/hello_android/Cargo.toml +++ b/examples/hello_android/Cargo.toml @@ -18,9 +18,9 @@ crate-type = ["cdylib", "lib"] [dependencies] eframe = { workspace = true, default-features = false, features = [ - "default_fonts", - "glow", - "android-native-activity", + "default_fonts", + "glow", + "android-native-activity", ] } egui_demo_lib = { workspace = true, features = ["chrono"] } diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index 924157ef..00e27989 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -13,8 +13,8 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } # For image support: diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml index 11693e98..84f1fe7e 100644 --- a/examples/hello_world_par/Cargo.toml +++ b/examples/hello_world_par/Cargo.toml @@ -17,11 +17,11 @@ ignored = ["winit"] # Just enable some features of it; see below [dependencies] eframe = { workspace = true, default-features = false, features = [ - # accesskit struggles with threading - "default_fonts", - "wayland", - "x11", - "wgpu", + # accesskit struggles with threading + "default_fonts", + "wayland", + "x11", + "wgpu", ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } # This is normally enabled by eframe/default, which is not being used here diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml index 2c60803f..954db50a 100644 --- a/examples/hello_world_simple/Cargo.toml +++ b/examples/hello_world_simple/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml index 325b7c28..f3786152 100644 --- a/examples/keyboard_events/Cargo.toml +++ b/examples/keyboard_events/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml index 9810b024..3187bf16 100644 --- a/examples/multiple_viewports/Cargo.toml +++ b/examples/multiple_viewports/Cargo.toml @@ -15,7 +15,7 @@ wgpu = ["eframe/wgpu"] [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/popups/Cargo.toml b/examples/popups/Cargo.toml index 85038c00..d1f19991 100644 --- a/examples/popups/Cargo.toml +++ b/examples/popups/Cargo.toml @@ -9,8 +9,8 @@ version.workspace = true [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index 046e33a4..2fd92d2a 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -20,8 +20,8 @@ wgpu = ["eframe/wgpu"] [dependencies] eframe = { workspace = true, features = [ - "default", - "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO + "default", + "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { workspace = true, features = ["auto-color", "humantime"] } log.workspace = true diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml index ca90a7c0..98396346 100644 --- a/examples/screenshot/Cargo.toml +++ b/examples/screenshot/Cargo.toml @@ -1,10 +1,7 @@ [package] name = "screenshot" version = "0.1.0" -authors = [ - "René Rössler ", - "Andreas Faber ", "Andreas Faber