Minor cleanups

MarijnS95 · MarijnS95 · commit a0a441c49520 · 2026-04-02T20:28:48.000+02:00
diff --git a/agdk-cpal/Cargo.toml b/agdk-cpal/Cargo.toml
@@ -3,8 +3,6 @@ name = "agdk-cpal"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/agdk-cpal/README.md b/agdk-cpal/README.md
@@ -2,7 +2,7 @@ This is a minimal test application based on `GameActivity` that just
 runs a mainloop based on android_activity::poll_events() and plays a
 sine wave audio test using the Cpal audio library.
 
-```
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_HOME="path/to/sdk"
 
diff --git a/agdk-cpal/src/lib.rs b/agdk-cpal/src/lib.rs
@@ -1,13 +1,13 @@
-///! Based on https://github.com/RustAudio/cpal/blob/master/examples/android.rs
-use android_activity::{AndroidApp, InputStatus, MainEvent, PollEvent};
+//! Based on https://github.com/RustAudio/cpal/blob/master/examples/android.rs
+
 use std::sync::OnceLock;
-use tracing::{error, info};
 
+use android_activity::{AndroidApp, InputStatus, MainEvent, PollEvent};
 use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    SizedSample,
+    FromSample, Sample, SizedSample,
 };
-use cpal::{FromSample, Sample};
+use tracing::{error, info};
 
 fn write_data<T>(output: &mut [T], channels: usize, next_sample: &mut dyn FnMut() -> f32)
 where
diff --git a/agdk-eframe/Cargo.toml b/agdk-eframe/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2021"
 resolver = "2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/agdk-eframe/README.md b/agdk-eframe/README.md
@@ -3,7 +3,7 @@ This tests using `GameActivity` with egui, winit and wgpu.
 This is based on a re-worked winit backend here:
 https://github.com/rib/winit/tree/android-activity
 
-```
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_HOME="path/to/sdk"
 
diff --git a/agdk-eframe/src/lib.rs b/agdk-eframe/src/lib.rs
@@ -1,7 +1,5 @@
-use eframe::egui;
-use eframe::{NativeOptions, Renderer};
+use eframe::{egui, NativeOptions, Renderer};
 use tracing::{error, info};
-
 #[cfg(target_os = "android")]
 use winit::platform::android::activity::AndroidApp;
 
diff --git a/agdk-egui/Cargo.toml b/agdk-egui/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2021"
 resolver = "2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/agdk-egui/src/lib.rs b/agdk-egui/src/lib.rs
@@ -1,22 +1,17 @@
 #[cfg(target_os = "android")]
 use std::sync::OnceLock;
 use std::{num::NonZeroU32, sync::Arc};
-use tracing::{debug, error};
 
 use egui::ViewportId;
-use egui_wgpu::RendererOptions;
-use egui_winit::winit;
-
-use winit::event_loop::{ActiveEventLoop, EventLoop};
-
+use egui_wgpu::{winit::Painter, RendererOptions};
+use egui_winit::{winit, State};
+use tracing::{debug, error};
 #[cfg(target_os = "android")]
 use winit::platform::android::activity::AndroidApp;
-
-use winit::event_loop::ControlFlow;
-
-use egui_wgpu::winit::Painter;
-use egui_winit::State;
-use winit::event::Event::*;
+use winit::{
+    event::Event::*,
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoop},
+};
 const INITIAL_WIDTH: u32 = 1920;
 const INITIAL_HEIGHT: u32 = 1080;
 
diff --git a/agdk-mainloop/Cargo.toml b/agdk-mainloop/Cargo.toml
@@ -3,8 +3,6 @@ name = "agdk-mainloop"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/agdk-mainloop/README.md b/agdk-mainloop/README.md
@@ -3,7 +3,7 @@ runs a mainloop based on android_activity::poll_events() and traces
 the events received without doing any rendering. It also saves and
 restores some minimal application state.
 
-```
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_HOME="path/to/sdk"
 
diff --git a/agdk-mainloop/src/lib.rs b/agdk-mainloop/src/lib.rs
@@ -227,6 +227,7 @@ fn android_main(app: AndroidApp) {
                                         }
                                         InputEvent::MotionEvent(motion_event) => {
                                             println!("action = {:?}", motion_event.action());
+                                            #[expect(clippy::single_match)]
                                             match motion_event.action() {
                                                 MotionAction::Up => {
                                                     let pointer = motion_event.pointer_index();
@@ -367,7 +368,7 @@ fn character_map_and_combine_key(
                     Some(unicode)
                 };
                 *combining_accent = None;
-                combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+                combined_unicode.map(KeyMapChar::Unicode)
             } else {
                 Some(KeyMapChar::Unicode(unicode))
             }
diff --git a/agdk-oboe/Cargo.toml b/agdk-oboe/Cargo.toml
@@ -3,8 +3,6 @@ name = "agdk-oboe"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 log = "0.4"
 android_logger = "0.13.1"
@@ -14,4 +12,4 @@ atomic_float = "0.1"
 
 [lib]
 name="main"
-crate_type=["cdylib"]
+crate_type=["cdylib"]
diff --git a/agdk-oboe/README.md b/agdk-oboe/README.md
@@ -2,7 +2,7 @@ This is a minimal test application based on `GameActivity` that just
 runs a mainloop based on android_activity::poll_events() and plays a
 sine wave audio test using the Oboe audio library.
 
-```
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_HOME="path/to/sdk"
 
diff --git a/agdk-oboe/src/audio.rs b/agdk-oboe/src/audio.rs
@@ -1,10 +1,10 @@
-use atomic_float::AtomicF32;
 use std::{
     f32::consts::PI,
     marker::PhantomData,
     sync::{atomic::Ordering, Arc},
 };
 
+use atomic_float::AtomicF32;
 use oboe::{
     AudioDeviceDirection, AudioDeviceInfo, AudioFeature, AudioOutputCallback, AudioOutputStream,
     AudioOutputStreamSafe, AudioStream, AudioStreamAsync, AudioStreamBase, AudioStreamBuilder,
diff --git a/agdk-winit-wgpu/Cargo.toml b/agdk-winit-wgpu/Cargo.toml
@@ -3,8 +3,6 @@ name = "agdk-winit-wgpu"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/agdk-winit-wgpu/src/app.rs b/agdk-winit-wgpu/src/app.rs
@@ -1,21 +1,19 @@
-use std::borrow::Cow;
 #[cfg(target_os = "android")]
 use std::ffi::c_void;
 #[cfg(target_os = "android")]
 use std::ptr::NonNull;
-use std::sync::Arc;
-
-use tracing::{error, info, trace, warn};
+use std::{borrow::Cow, sync::Arc};
 
 use raw_window_handle::{HandleError, HasDisplayHandle, HasWindowHandle};
-use wgpu::{Adapter, Device, Instance, PipelineLayout, Queue, RenderPipeline, ShaderModule};
-use wgpu::{PipelineCompilationOptions, TextureFormat};
-
-use winit::error::EventLoopError;
-use winit::event_loop::{EventLoop, EventLoopProxy};
+use tracing::{error, info, trace, warn};
+use wgpu::{
+    Adapter, Device, Instance, PipelineCompilationOptions, PipelineLayout, Queue, RenderPipeline,
+    ShaderModule, TextureFormat,
+};
 use winit::{
+    error::EventLoopError,
     event::{Event, WindowEvent},
-    event_loop::{ActiveEventLoop, ControlFlow},
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoop, EventLoopProxy},
 };
 
 #[derive(Debug)]
diff --git a/agdk-winit-wgpu/src/lib.rs b/agdk-winit-wgpu/src/lib.rs
@@ -8,11 +8,11 @@ mod app;
 #[cfg(target_os = "android")]
 #[unsafe(no_mangle)]
 fn android_main(app: AndroidApp) {
-    use app::App;
     use std::sync::OnceLock;
+
+    use app::App;
     use tracing::error;
-    use winit::event_loop::EventLoop;
-    use winit::platform::android::EventLoopBuilderExtAndroid;
+    use winit::{event_loop::EventLoop, platform::android::EventLoopBuilderExtAndroid};
 
     std::env::set_var("RUST_BACKTRACE", "full");
     std::env::set_var("WGPU_BACKEND", "vulkan");
diff --git a/agdk-winit-wgpu/src/main.rs b/agdk-winit-wgpu/src/main.rs
@@ -5,10 +5,8 @@ mod app;
 #[cfg(target_arch = "wasm32")]
 pub fn main() {
     use app::App;
-    use tracing_subscriber::layer::SubscriberExt;
-    use tracing_subscriber::util::SubscriberInitExt;
-    use winit::event_loop::EventLoop;
-    use winit::platform::web::EventLoopExtWebSys;
+    use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+    use winit::{event_loop::EventLoop, platform::web::EventLoopExtWebSys};
 
     console_error_panic_hook::set_once();
 
@@ -52,9 +50,8 @@ use winit::error::EventLoopError;
 #[allow(dead_code)]
 #[cfg(not(any(target_os = "android", target_arch = "wasm32")))]
 fn main() -> Result<(), EventLoopError> {
-    use winit::event_loop::EventLoop;
-
     use app::App;
+    use winit::event_loop::EventLoop;
 
     if std::option_env!("RUST_LOG").is_none() {
         std::env::set_var("RUST_LOG", app::DEFAULT_ENV_FILTER);
diff --git a/na-egui/Cargo.toml b/na-egui/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2021"
 resolver = "2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
diff --git a/na-egui/src/lib.rs b/na-egui/src/lib.rs
@@ -1,20 +1,15 @@
 use std::{num::NonZeroU32, sync::Arc};
-use tracing::{debug, error};
 
 use egui::ViewportId;
-use egui_wgpu::RendererOptions;
-use egui_winit::winit;
-
-use winit::event_loop::{ActiveEventLoop, EventLoop};
-
+use egui_wgpu::{winit::Painter, RendererOptions};
+use egui_winit::{winit, State};
+use tracing::{debug, error};
 #[cfg(target_os = "android")]
 use winit::platform::android::activity::AndroidApp;
-
-use winit::event_loop::ControlFlow;
-
-use egui_wgpu::winit::Painter;
-use egui_winit::State;
-use winit::event::Event::*;
+use winit::{
+    event::Event::*,
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoop},
+};
 const INITIAL_WIDTH: u32 = 1920;
 const INITIAL_HEIGHT: u32 = 1080;
 
@@ -209,6 +204,7 @@ const DEFAULT_ENV_FILTER: &str = "debug,wgpu_hal=info,winit=info,naga=info";
 #[no_mangle]
 fn android_main(app: AndroidApp) {
     use std::sync::OnceLock;
+
     use winit::platform::android::EventLoopBuilderExtAndroid;
 
     std::env::set_var("RUST_BACKTRACE", "full");
diff --git a/na-mainloop/Cargo.toml b/na-mainloop/Cargo.toml
@@ -3,8 +3,6 @@ name = "na-mainloop"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 #log = "0.4"
 #android_logger = "0.11.0"
diff --git a/na-mainloop/README.md b/na-mainloop/README.md
@@ -7,7 +7,7 @@ Since this test doesn't require a custom `Activity` subclass it's
 optionally possible to build this example with `cargo apk`.
 
 # Gradle Build
-```
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_HOME="path/to/sdk"
 
@@ -26,7 +26,8 @@ adb shell am start -n com.github.realfit_mobile.namainloop/android.app.NativeAct
 ```
 
 # Cargo APK Build
-```
+
+```bash
 export ANDROID_NDK_HOME="path/to/ndk"
 export ANDROID_SDK_HOME="path/to/sdk"
 
diff --git a/na-mainloop/src/lib.rs b/na-mainloop/src/lib.rs
@@ -1,9 +1,8 @@
 use std::sync::OnceLock;
 
 use android_activity::{
-    AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
     input::{InputEvent, KeyAction, KeyEvent, KeyMapChar, MotionAction},
-    ndk, ndk_sys,
+    ndk, ndk_sys, AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
 };
 use jni::{
     objects::{JObject, JString},
@@ -228,6 +227,7 @@ fn android_main(app: AndroidApp) {
                                         }
                                         InputEvent::MotionEvent(motion_event) => {
                                             println!("action = {:?}", motion_event.action());
+                                            #[expect(clippy::single_match)]
                                             match motion_event.action() {
                                                 MotionAction::Up => {
                                                     let pointer = motion_event.pointer_index();
@@ -368,7 +368,7 @@ fn character_map_and_combine_key(
                     Some(unicode)
                 };
                 *combining_accent = None;
-                combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+                combined_unicode.map(KeyMapChar::Unicode)
             } else {
                 Some(KeyMapChar::Unicode(unicode))
             }
diff --git a/na-openxr-info/Cargo.toml b/na-openxr-info/Cargo.toml
@@ -3,8 +3,6 @@ name = "na-openxr-info"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 log = "0.4"
 openxr = { version = "0.17" }
@@ -17,17 +15,17 @@ android_logger = "0.11.0"
 android-activity = { version = "0.4", features = ["native-activity"] }
 
 [features]
-default = [ "linked" ]
+default = ["linked"]
 
-android = [ "openxr/linked" ]
-desktop = [ "linked", "openxr/static"]
-linked = []
+android = ["linked"]
+desktop = ["linked", "openxr/static"]
+linked = ["openxr/linked"]
 
 [lib]
-name="main"
-crate_type=["cdylib"]
+name = "main"
+crate_type = ["cdylib"]
 
 [[bin]]
-path="src/lib.rs"
-name="test-winit-wgpu"
-required-features = [ "desktop" ]
+path = "src/lib.rs"
+name = "test-winit-wgpu"
+required-features = ["desktop"]
diff --git a/na-openxr-info/src/lib.rs b/na-openxr-info/src/lib.rs
diff --git a/na-openxr-wgpu/Cargo.toml b/na-openxr-wgpu/Cargo.toml
diff --git a/na-openxr-wgpu/README.md b/na-openxr-wgpu/README.md
diff --git a/na-openxr-wgpu/src/lib.rs b/na-openxr-wgpu/src/lib.rs
diff --git a/na-subclass-jni/Cargo.toml b/na-subclass-jni/Cargo.toml
diff --git a/na-subclass-jni/README.md b/na-subclass-jni/README.md
diff --git a/na-winit-glutin/build.rs b/na-winit-glutin/build.rs
diff --git a/na-winit-glutin/src/lib.rs b/na-winit-glutin/src/lib.rs
diff --git a/na-winit-wgpu/Cargo.toml b/na-winit-wgpu/Cargo.toml
diff --git a/na-winit-wgpu/src/app.rs b/na-winit-wgpu/src/app.rs
diff --git a/na-winit-wgpu/src/lib.rs b/na-winit-wgpu/src/lib.rs
diff --git a/na-winit-wgpu/src/main.rs b/na-winit-wgpu/src/main.rs
