Merge branch 'master' into emilk/lfs-ci

emilk · Oct 29, 2024 · e4354af · e4354af
2 parents 4a3939a + 9e763fc
commit e4354af
Show file tree

Hide file tree

Showing 29 changed files with 78 additions and 78 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
 * text=auto eol=lf
 Cargo.lock linguist-generated=false
-**/tests/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
diff --git a/clippy.toml b/clippy.toml
@@ -1,77 +1,77 @@
-# There is also a scripts/clippy_wasm/clippy.toml which forbids some methods that are not available in wasm.
-
-# -----------------------------------------------------------------------------
-# Section identical to scripts/clippy_wasm/clippy.toml:
-
-msrv = "1.76"
-
-allow-unwrap-in-tests = true
-
-# https://doc.rust-lang.org/nightly/clippy/lint_configuration.html#avoid-breaking-exported-api
-# We want suggestions, even if it changes public API.
-avoid-breaking-exported-api = false
-
-max-fn-params-bools = 2 # TODO(emilk): decrease this to 1
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#/large_include_file
-max-include-file-size = 1000000
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#/type_complexity
-type-complexity-threshold = 350
-
-# -----------------------------------------------------------------------------
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_macros
-disallowed-macros = [
-    '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',
-]
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_methods
-disallowed-methods = [
-    "std::env::temp_dir", # Use the tempdir crate instead
-
-    # 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.
-
-    "std::thread::spawn", # Use `std::thread::Builder` and name the thread
-
-    "sha1::Digest::new", # SHA1 is cryptographically broken
-
-    "std::panic::catch_unwind", # We compile with `panic = "abort"`
-]
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names
-disallowed-names = []
-
-# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_types
-disallowed-types = [
-    # Use the faster & simpler non-poisonable primitives in `parking_lot` instead
-    "std::sync::Mutex",
-    "std::sync::RwLock",
-    "std::sync::Condvar",
-    # "std::sync::Once",  # enabled for now as the `log_once` macro uses it internally
-
-    "ring::digest::SHA1_FOR_LEGACY_USE_ONLY", # SHA1 is cryptographically broken
-
-    "winit::dpi::LogicalSize",     # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
-    "winit::dpi::LogicalPosition", # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
-]
-
-# -----------------------------------------------------------------------------
-
-# 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 the root `clippy.toml`!
-    "AccessKit",
-    "WebGL",
-    "WebGPU",
-    "..",
-]
+# There is also a scripts/clippy_wasm/clippy.toml which forbids some methods that are not available in wasm.
+
+# -----------------------------------------------------------------------------
+# Section identical to scripts/clippy_wasm/clippy.toml:
+
+msrv = "1.76"
+
+allow-unwrap-in-tests = true
+
+# https://doc.rust-lang.org/nightly/clippy/lint_configuration.html#avoid-breaking-exported-api
+# We want suggestions, even if it changes public API.
+avoid-breaking-exported-api = false
+
+max-fn-params-bools = 2 # TODO(emilk): decrease this to 1
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#/large_include_file
+max-include-file-size = 1000000
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#/type_complexity
+type-complexity-threshold = 350
+
+# -----------------------------------------------------------------------------
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_macros
+disallowed-macros = [
+    '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',
+]
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_methods
+disallowed-methods = [
+    "std::env::temp_dir", # Use the tempdir crate instead
+
+    # 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.
+
+    "std::thread::spawn", # Use `std::thread::Builder` and name the thread
+
+    "sha1::Digest::new", # SHA1 is cryptographically broken
+
+    "std::panic::catch_unwind", # We compile with `panic = "abort"`
+]
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names
+disallowed-names = []
+
+# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_types
+disallowed-types = [
+    # Use the faster & simpler non-poisonable primitives in `parking_lot` instead
+    "std::sync::Mutex",
+    "std::sync::RwLock",
+    "std::sync::Condvar",
+    # "std::sync::Once",  # enabled for now as the `log_once` macro uses it internally
+
+    "ring::digest::SHA1_FOR_LEGACY_USE_ONLY", # SHA1 is cryptographically broken
+
+    "winit::dpi::LogicalSize",     # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
+    "winit::dpi::LogicalPosition", # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
+]
+
+# -----------------------------------------------------------------------------
+
+# 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 the root `clippy.toml`!
+    "AccessKit",
+    "WebGL",
+    "WebGPU",
+    "..",
+]
diff --git a/crates/eframe/data/icon.png b/crates/eframe/data/icon.png
diff --git a/crates/egui/assets/ferris.png b/crates/egui/assets/ferris.png
diff --git a/crates/egui_demo_lib/data/icon.png b/crates/egui_demo_lib/data/icon.png
diff --git a/examples/confirm_exit/screenshot.png b/examples/confirm_exit/screenshot.png
diff --git a/examples/custom_3d_glow/screenshot.png b/examples/custom_3d_glow/screenshot.png
diff --git a/examples/custom_font/screenshot.png b/examples/custom_font/screenshot.png
diff --git a/examples/custom_font_style/screenshot.png b/examples/custom_font_style/screenshot.png
diff --git a/examples/custom_keypad/screenshot.png b/examples/custom_keypad/screenshot.png
diff --git a/examples/custom_style/screenshot.png b/examples/custom_style/screenshot.png
diff --git a/examples/custom_window_frame/screenshot.png b/examples/custom_window_frame/screenshot.png
diff --git a/examples/file_dialog/screenshot.png b/examples/file_dialog/screenshot.png
diff --git a/examples/hello_world/screenshot.png b/examples/hello_world/screenshot.png
diff --git a/examples/hello_world_simple/screenshot.png b/examples/hello_world_simple/screenshot.png
diff --git a/examples/images/screenshot.png b/examples/images/screenshot.png
diff --git a/examples/keyboard_events/screenshot.png b/examples/keyboard_events/screenshot.png
diff --git a/examples/puffin_profiler/screenshot.png b/examples/puffin_profiler/screenshot.png
diff --git a/examples/screenshot/screenshot.png b/examples/screenshot/screenshot.png
diff --git a/examples/serial_windows/screenshot.png b/examples/serial_windows/screenshot.png
diff --git a/examples/user_attention/screenshot.png b/examples/user_attention/screenshot.png
diff --git a/media/demo-2020-08-21.png b/media/demo-2020-08-21.png
diff --git a/media/demo-2020-10-24.png b/media/demo-2020-10-24.png
diff --git a/media/demo-2021-01-02.png b/media/demo-2021-01-02.png
diff --git a/media/demo_light_mode.png b/media/demo_light_mode.png
diff --git a/media/light_theme.png b/media/light_theme.png
diff --git a/media/pompodoro-skin.png b/media/pompodoro-skin.png
diff --git a/media/rerun_io_logo.png b/media/rerun_io_logo.png
diff --git a/media/widget_gallery_0.23_light.png b/media/widget_gallery_0.23_light.png