Rustfmt: use group_imports

dpi/src/lib.rs

@@ -761,9 +761,10 @@ impl<P: Pixel> From<LogicalPosition<P>> for Position {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::collections::HashSet;
 
+    use super::*;
+
     macro_rules! test_pixel_int_impl {
         ($($name:ident => $ty:ty),*) => {$(
             #[test]

examples/control_flow.rs

@@ -7,7 +7,6 @@ use std::time;
 use ::tracing::{info, warn};
 #[cfg(web_platform)]
 use web_time as time;
-
 use winit::application::ApplicationHandler;
 use winit::event::{ElementState, KeyEvent, StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};

examples/window.rs

@@ -14,23 +14,21 @@ use cursor_icon::CursorIcon;
 use rwh_06::{DisplayHandle, HasDisplayHandle};
 #[cfg(not(any(android_platform, ios_platform)))]
 use softbuffer::{Context, Surface};
-
 use winit::application::ApplicationHandler;
 use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize};
 use winit::event::{DeviceEvent, DeviceId, Ime, MouseButton, MouseScrollDelta, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, EventLoop};
 use winit::keyboard::{Key, ModifiersState};
-use winit::window::{
-    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
-    Theme, Window, WindowId,
-};
-
 #[cfg(macos_platform)]
 use winit::platform::macos::{OptionAsAlt, WindowAttributesExtMacOS, WindowExtMacOS};
 #[cfg(any(x11_platform, wayland_platform))]
 use winit::platform::startup_notify::{
     self, EventLoopExtStartupNotify, WindowAttributesExtStartupNotify, WindowExtStartupNotify,
 };
+use winit::window::{
+    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
+    Theme, Window, WindowId,
+};
 
 #[path = "util/tracing.rs"]
 mod tracing;
@@ -705,6 +703,7 @@ impl WindowState {
         custom_cursors: &[CustomCursor],
     ) {
         use std::time::Duration;
+
         use winit::platform::web::CustomCursorExtWebSys;
 
         let cursors = vec![

rustfmt.toml

@@ -11,6 +11,7 @@ error_on_unformatted = true
 format_macro_bodies = true
 hex_literal_case = "Lower"
 normalize_comments = true
+group_imports = "StdExternalCrate"
 # Some macros break with this.
 reorder_impl_items = false
 newline_style = "Unix"

src/event.rs

@@ -1004,9 +1004,10 @@ impl PartialEq for InnerSizeWriter {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::{BTreeSet, HashSet};
+
     use crate::dpi::PhysicalPosition;
     use crate::event;
-    use std::collections::{BTreeSet, HashSet};
 
     macro_rules! foreach_event {
         ($closure:expr) => {{

src/event_loop.rs

@@ -13,9 +13,9 @@ use std::marker::PhantomData;
 #[cfg(any(x11_platform, wayland_platform))]
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-
 #[cfg(not(web_platform))]
 use std::time::{Duration, Instant};
+
 #[cfg(web_platform)]
 use web_time::{Duration, Instant};
 

src/icon.rs

@@ -1,7 +1,8 @@
-use crate::platform_impl::PlatformIcon;
 use std::error::Error;
 use std::{fmt, io, mem};
 
+use crate::platform_impl::PlatformIcon;
+
 #[repr(C)]
 #[derive(Debug)]
 pub(crate) struct Pixel {

src/keyboard.rs

@@ -1758,9 +1758,10 @@ bitflags! {
 
 #[cfg(feature = "serde")]
 mod modifiers_serde {
-    use super::ModifiersState;
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
+    use super::ModifiersState;
+
     #[derive(Default, Serialize, Deserialize)]
     #[serde(default)]
     #[serde(rename = "ModifiersState")]

src/lib.rs

@@ -177,17 +177,16 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg_hide), doc(cfg_hide(doc, docsrs)))]
 #![allow(clippy::missing_safety_doc)]
 
+// Re-export DPI types so that users don't have to put it in Cargo.toml.
+#[doc(inline)]
+pub use dpi;
 #[cfg(feature = "rwh_04")]
 pub use rwh_04 as raw_window_handle_04;
 #[cfg(feature = "rwh_05")]
 pub use rwh_05 as raw_window_handle_05;
 #[cfg(feature = "rwh_06")]
 pub use rwh_06 as raw_window_handle;
 
-// Re-export DPI types so that users don't have to put it in Cargo.toml.
-#[doc(inline)]
-pub use dpi;
-
 pub mod application;
 #[cfg(any(doc, doctest, test))]
 pub mod changelog;

src/platform/android.rs

@@ -70,11 +70,10 @@
 //! 4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your
 //!    event loop (as shown above).
 
+use self::activity::{AndroidApp, ConfigurationRef, Rect};
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::window::{Window, WindowAttributes};
 
-use self::activity::{AndroidApp, ConfigurationRef, Rect};
-
 /// Additional methods on [`EventLoop`] that are specific to Android.
 pub trait EventLoopExtAndroid {}
 

src/platform/run_on_demand.rs

@@ -1,7 +1,6 @@
 use crate::application::ApplicationHandler;
 use crate::error::EventLoopError;
 use crate::event_loop::{ActiveEventLoop, EventLoop};
-
 #[cfg(doc)]
 use crate::{platform::pump_events::EventLoopExtPumpEvents, window::Window};
 

src/platform/wayland.rs

@@ -15,9 +15,8 @@
 //! * `wayland-csd-adwaita-notitle`.
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::monitor::MonitorHandle;
-use crate::window::{Window, WindowAttributes};
-
 pub use crate::window::Theme;
+use crate::window::{Window, WindowAttributes};
 
 /// Additional methods on [`ActiveEventLoop`] that are specific to Wayland.
 pub trait ActiveEventLoopExtWayland {

src/platform/windows.rs

@@ -337,6 +337,7 @@ pub trait WindowExtWindows {
     /// # use winit::window::Window;
     /// # fn scope(window: Window) {
     /// use std::thread;
+    ///
     /// use winit::platform::windows::WindowExtWindows;
     /// use winit::raw_window_handle::HasWindowHandle;
     ///

src/platform/x11.rs

@@ -2,12 +2,11 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+use crate::dpi::Size;
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::monitor::MonitorHandle;
 use crate::window::{Window, WindowAttributes};
 
-use crate::dpi::Size;
-
 /// X window type. Maps directly to
 /// [`_NET_WM_WINDOW_TYPE`](https://specifications.freedesktop.org/wm-spec/wm-spec-1.5.html).
 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Hash)]

src/platform_impl/apple/appkit/app_state.rs

@@ -10,15 +10,14 @@ use objc2::{declare_class, msg_send_id, mutability, ClassType, DeclaredClass};
 use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy, NSApplicationDelegate};
 use objc2_foundation::{MainThreadMarker, NSNotification, NSObject, NSObjectProtocol};
 
-use crate::application::ApplicationHandler;
-use crate::event::{StartCause, WindowEvent};
-use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow};
-use crate::window::WindowId as RootWindowId;
-
 use super::event_handler::EventHandler;
 use super::event_loop::{stop_app_immediately, ActiveEventLoop, PanicInfo};
 use super::observer::{EventLoopWaker, RunLoop};
 use super::{menu, WindowId};
+use crate::application::ApplicationHandler;
+use crate::event::{StartCause, WindowEvent};
+use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow};
+use crate::window::WindowId as RootWindowId;
 
 #[derive(Debug)]
 pub(super) struct AppState {

src/platform_impl/apple/appkit/mod.rs

@@ -17,19 +17,17 @@ mod window_delegate;
 
 use std::fmt;
 
+pub(crate) use self::cursor::CustomCursor as PlatformCustomCursor;
 pub(crate) use self::event::{physicalkey_to_scancode, scancode_to_physicalkey, KeyEventExtra};
 pub(crate) use self::event_loop::{
     ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
     PlatformSpecificEventLoopAttributes,
 };
 pub(crate) use self::monitor::{MonitorHandle, VideoModeHandle};
-pub(crate) use self::window::WindowId;
+pub(crate) use self::window::{Window, WindowId};
 pub(crate) use self::window_delegate::PlatformSpecificWindowAttributes;
-use crate::event::DeviceId as RootDeviceId;
-
-pub(crate) use self::cursor::CustomCursor as PlatformCustomCursor;
-pub(crate) use self::window::Window;
 pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
+use crate::event::DeviceId as RootDeviceId;
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
 pub(crate) use crate::platform_impl::Fullscreen;
 

src/platform_impl/apple/uikit/event_loop.rs

@@ -17,17 +17,15 @@ use objc2::{msg_send_id, ClassType};
 use objc2_foundation::{MainThreadMarker, NSString};
 use objc2_ui_kit::{UIApplication, UIApplicationMain, UIScreen};
 
-use super::app_state::EventLoopHandler;
+use super::app_delegate::AppDelegate;
+use super::app_state::{AppState, EventLoopHandler};
+use super::{app_state, monitor, MonitorHandle};
 use crate::application::ApplicationHandler;
 use crate::error::EventLoopError;
 use crate::event::Event;
 use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents};
 use crate::window::{CustomCursor, CustomCursorSource};
 
-use super::app_delegate::AppDelegate;
-use super::app_state::AppState;
-use super::{app_state, monitor, MonitorHandle};
-
 #[derive(Debug)]
 pub struct ActiveEventLoop {
     pub(super) mtm: MainThreadMarker,

src/platform_impl/apple/uikit/mod.rs

@@ -10,8 +10,6 @@ mod window;
 
 use std::fmt;
 
-use crate::event::DeviceId as RootDeviceId;
-
 pub(crate) use self::event_loop::{
     ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
     PlatformSpecificEventLoopAttributes,
@@ -21,6 +19,7 @@ pub(crate) use self::window::{PlatformSpecificWindowAttributes, Window, WindowId
 pub(crate) use crate::cursor::{
     NoCustomCursor as PlatformCustomCursor, NoCustomCursor as PlatformCustomCursorSource,
 };
+use crate::event::DeviceId as RootDeviceId;
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
 pub(crate) use crate::platform_impl::Fullscreen;
 

src/platform_impl/linux/common/xkb/compose.rs

@@ -6,13 +6,14 @@ use std::ops::Deref;
 use std::os::unix::ffi::OsStringExt;
 use std::ptr::NonNull;
 
-use super::{XkbContext, XKBCH};
 use smol_str::SmolStr;
 use xkbcommon_dl::{
     xkb_compose_compile_flags, xkb_compose_feed_result, xkb_compose_state, xkb_compose_state_flags,
     xkb_compose_status, xkb_compose_table, xkb_keysym_t,
 };
 
+use super::{XkbContext, XKBCH};
+
 #[derive(Debug)]
 pub struct XkbComposeTable {
     table: NonNull<xkb_compose_table>,

src/platform_impl/linux/common/xkb/keymap.rs

@@ -6,14 +6,13 @@ use std::ptr::{self, NonNull};
 
 #[cfg(x11_platform)]
 use x11_dl::xlib_xcb::xcb_connection_t;
-#[cfg(wayland_platform)]
-use {memmap2::MmapOptions, std::os::unix::io::OwnedFd};
-
 use xkb::XKB_MOD_INVALID;
 use xkbcommon_dl::{
     self as xkb, xkb_keycode_t, xkb_keymap, xkb_keymap_compile_flags, xkb_keysym_t,
     xkb_layout_index_t, xkb_mod_index_t,
 };
+#[cfg(wayland_platform)]
+use {memmap2::MmapOptions, std::os::unix::io::OwnedFd};
 
 use crate::keyboard::{Key, KeyCode, KeyLocation, NamedKey, NativeKey, NativeKeyCode, PhysicalKey};
 #[cfg(x11_platform)]

src/platform_impl/linux/common/xkb/mod.rs

@@ -1,12 +1,11 @@
 use std::ops::Deref;
 use std::os::raw::c_char;
+#[cfg(wayland_platform)]
+use std::os::unix::io::OwnedFd;
 use std::ptr::{self, NonNull};
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use crate::utils::Lazy;
 use smol_str::SmolStr;
-#[cfg(wayland_platform)]
-use std::os::unix::io::OwnedFd;
 use tracing::warn;
 use xkbcommon_dl::{
     self as xkb, xkb_compose_status, xkb_context, xkb_context_flags, xkbcommon_compose_handle,
@@ -18,16 +17,16 @@ use {x11_dl::xlib_xcb::xcb_connection_t, xkbcommon_dl::x11::xkbcommon_x11_handle
 use crate::event::{ElementState, KeyEvent};
 use crate::keyboard::{Key, KeyLocation};
 use crate::platform_impl::KeyEventExtra;
+use crate::utils::Lazy;
 
 mod compose;
 mod keymap;
 mod state;
 
 use compose::{ComposeStatus, XkbComposeState, XkbComposeTable};
-use keymap::XkbKeymap;
-
 #[cfg(x11_platform)]
 pub use keymap::raw_keycode_to_physicalkey;
+use keymap::XkbKeymap;
 pub use keymap::{physicalkey_to_scancode, scancode_to_physicalkey};
 pub use state::XkbState;
 

src/platform_impl/linux/mod.rs

@@ -11,31 +11,30 @@ use std::{env, fmt};
 #[cfg(x11_platform)]
 use std::{ffi::CStr, mem::MaybeUninit, os::raw::*, sync::Mutex};
 
-use crate::application::ApplicationHandler;
-use crate::platform::pump_events::PumpStatus;
-#[cfg(x11_platform)]
-use crate::utils::Lazy;
 use smol_str::SmolStr;
 
+pub(crate) use self::common::xkb::{physicalkey_to_scancode, scancode_to_physicalkey};
 #[cfg(x11_platform)]
 use self::x11::{X11Error, XConnection, XError, XNotSupported};
+use crate::application::ApplicationHandler;
+pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
 use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{EventLoopError, ExternalError, NotSupportedError, OsError as RootOsError};
 use crate::event_loop::{AsyncRequestSerial, ControlFlow, DeviceEvents};
 use crate::icon::Icon;
+pub(crate) use crate::icon::RgbaIcon as PlatformIcon;
 use crate::keyboard::Key;
+use crate::platform::pump_events::PumpStatus;
 #[cfg(x11_platform)]
 use crate::platform::x11::{WindowType as XWindowType, XlibErrorHook};
+pub(crate) use crate::platform_impl::Fullscreen;
+#[cfg(x11_platform)]
+use crate::utils::Lazy;
 use crate::window::{
     ActivationToken, Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, ImePurpose,
     ResizeDirection, Theme, UserAttentionType, WindowAttributes, WindowButtons, WindowLevel,
 };
 
-pub(crate) use self::common::xkb::{physicalkey_to_scancode, scancode_to_physicalkey};
-pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
-pub(crate) use crate::icon::RgbaIcon as PlatformIcon;
-pub(crate) use crate::platform_impl::Fullscreen;
-
 pub(crate) mod common;
 #[cfg(wayland_platform)]
 pub(crate) mod wayland;

src/platform_impl/linux/wayland/event_loop/sink.rs

@@ -2,12 +2,11 @@
 
 use std::vec::Drain;
 
+use super::{DeviceId, WindowId};
 use crate::event::{DeviceEvent, DeviceId as RootDeviceId, Event, WindowEvent};
 use crate::platform_impl::platform::DeviceId as PlatformDeviceId;
 use crate::window::WindowId as RootWindowId;
 
-use super::{DeviceId, WindowId};
-
 /// An event loop's sink to deliver events from the Wayland event callbacks
 /// to the winit's user.
 #[derive(Default)]