for f in $(git diff 9f8fcc2 --name-only | pcregrep 'target/.*_2024');…

… do cargo run --bin rustfmt -- $f ; done
rust-lang · Dec 17, 2024 · 0eecc48 · 0eecc48
1 parent 1d1fb66
commit 0eecc48
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 54 deletions.
diff --git a/tests/target/5131_crate_2024.rs b/tests/target/5131_crate_2024.rs
@@ -11,45 +11,45 @@ use qux::{h, h as h2, i};
 
 mod indent4 {
     use column_____________________________________________________________________________________102::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use column_______________________________________________________________________________096::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use column_________________________________________________________________________090::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
         c102::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 }
 
 use smithay::{
     backend::renderer::element::{
-        default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
+        RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
     },
     delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
     delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -59,37 +59,37 @@ use smithay::{
     delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
     delegate_xdg_decoration, delegate_xdg_shell,
     desktop::{
+        PopupKind, PopupManager, Space,
         space::SpaceElement,
         utils::{
-            surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
-            update_surface_primary_scanout_output, OutputPresentationFeedback,
+            OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
+            surface_primary_scanout_output, update_surface_primary_scanout_output,
         },
-        PopupKind, PopupManager, Space,
     },
     input::{
+        Seat, SeatHandler, SeatState,
         keyboard::{Keysym, LedState, XkbConfig},
         pointer::{CursorImageStatus, PointerHandle},
-        Seat, SeatHandler, SeatState,
     },
     output::Output,
     reexports::{
-        calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
+        calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
         wayland_protocols::xdg::decoration::{
             self as xdg_decoration,
             zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
         },
         wayland_server::{
+            Display, DisplayHandle, Resource,
             backend::{ClientData, ClientId, DisconnectReason},
             protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
-            Display, DisplayHandle, Resource,
         },
     },
     utils::{Clock, Monotonic, Rectangle},
     wayland::{
-        compositor::{get_parent, with_states, CompositorClientState, CompositorState},
+        compositor::{CompositorClientState, CompositorState, get_parent, with_states},
         dmabuf::DmabufFeedback,
         fractional_scale::{
-            with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
+            FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
         },
         input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
         keyboard_shortcuts_inhibit::{
@@ -98,7 +98,7 @@ use smithay::{
         },
         output::{OutputHandler, OutputManagerState},
         pointer_constraints::{
-            with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
+            PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
         },
         pointer_gestures::PointerGesturesState,
         presentation::PresentationState,
@@ -109,21 +109,21 @@ use smithay::{
             SecurityContextState,
         },
         selection::{
+            SelectionHandler,
             data_device::{
-                set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
-                ServerDndGrabHandler,
+                ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
+                set_data_device_focus,
             },
             primary_selection::{
-                set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
+                PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
             },
             wlr_data_control::{DataControlHandler, DataControlState},
-            SelectionHandler,
         },
         shell::{
             wlr_layer::WlrLayerShellState,
             xdg::{
-                decoration::{XdgDecorationHandler, XdgDecorationState},
                 ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
+                decoration::{XdgDecorationHandler, XdgDecorationState},
             },
         },
         shm::{ShmHandler, ShmState},

diff --git a/tests/target/5131_module_2024.rs b/tests/target/5131_module_2024.rs
@@ -131,12 +131,12 @@ mod indent4 {
 
 use smithay::backend::renderer::element::utils::select_dmabuf_feedback;
 use smithay::backend::renderer::element::{
-    default_primary_scanout_output_compare, RenderElementStates,
+    RenderElementStates, default_primary_scanout_output_compare,
 };
 use smithay::desktop::space::SpaceElement;
 use smithay::desktop::utils::{
-    surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
-    update_surface_primary_scanout_output, OutputPresentationFeedback,
+    OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
+    surface_primary_scanout_output, update_surface_primary_scanout_output,
 };
 use smithay::desktop::{PopupKind, PopupManager, Space};
 use smithay::input::keyboard::{Keysym, LedState, XkbConfig};
@@ -154,19 +154,19 @@ use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::reexports::wayland_server::{Display, DisplayHandle, Resource};
 use smithay::utils::{Clock, Monotonic, Rectangle};
 use smithay::wayland::compositor::{
-    get_parent, with_states, CompositorClientState, CompositorState,
+    CompositorClientState, CompositorState, get_parent, with_states,
 };
 use smithay::wayland::dmabuf::DmabufFeedback;
 use smithay::wayland::fractional_scale::{
-    with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
+    FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
 };
 use smithay::wayland::input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface};
 use smithay::wayland::keyboard_shortcuts_inhibit::{
     KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, KeyboardShortcutsInhibitor,
 };
 use smithay::wayland::output::{OutputHandler, OutputManagerState};
 use smithay::wayland::pointer_constraints::{
-    with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
+    PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
 };
 use smithay::wayland::pointer_gestures::PointerGesturesState;
 use smithay::wayland::presentation::PresentationState;
@@ -175,15 +175,15 @@ use smithay::wayland::seat::WaylandFocus;
 use smithay::wayland::security_context::{
     SecurityContext, SecurityContextHandler, SecurityContextListenerSource, SecurityContextState,
 };
+use smithay::wayland::selection::SelectionHandler;
 use smithay::wayland::selection::data_device::{
-    set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
-    ServerDndGrabHandler,
+    ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
+    set_data_device_focus,
 };
 use smithay::wayland::selection::primary_selection::{
-    set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
+    PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
 };
 use smithay::wayland::selection::wlr_data_control::{DataControlHandler, DataControlState};
-use smithay::wayland::selection::SelectionHandler;
 use smithay::wayland::shell::wlr_layer::WlrLayerShellState;
 use smithay::wayland::shell::xdg::decoration::{XdgDecorationHandler, XdgDecorationState};
 use smithay::wayland::shell::xdg::{ToplevelSurface, XdgShellState, XdgToplevelSurfaceData};

diff --git a/tests/target/5131_one_2024.rs b/tests/target/5131_one_2024.rs
@@ -14,45 +14,45 @@ use {
 
 mod indent4 {
     use column_____________________________________________________________________________________102::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use column_______________________________________________________________________________096::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use column_________________________________________________________________________090::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
         c102::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 
     use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
-        bar::{baz::Baz, Bar, Bar2},
         Foo, Foo2,
+        bar::{Bar, Bar2, baz::Baz},
     };
 }
 
 use smithay::{
     backend::renderer::element::{
-        default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
+        RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
     },
     delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
     delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -62,37 +62,37 @@ use smithay::{
     delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
     delegate_xdg_decoration, delegate_xdg_shell,
     desktop::{
+        PopupKind, PopupManager, Space,
         space::SpaceElement,
         utils::{
-            surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
-            update_surface_primary_scanout_output, OutputPresentationFeedback,
+            OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
+            surface_primary_scanout_output, update_surface_primary_scanout_output,
         },
-        PopupKind, PopupManager, Space,
     },
     input::{
+        Seat, SeatHandler, SeatState,
         keyboard::{Keysym, LedState, XkbConfig},
         pointer::{CursorImageStatus, PointerHandle},
-        Seat, SeatHandler, SeatState,
     },
     output::Output,
     reexports::{
-        calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
+        calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
         wayland_protocols::xdg::decoration::{
             self as xdg_decoration,
             zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
         },
         wayland_server::{
+            Display, DisplayHandle, Resource,
             backend::{ClientData, ClientId, DisconnectReason},
             protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
-            Display, DisplayHandle, Resource,
         },
     },
     utils::{Clock, Monotonic, Rectangle},
     wayland::{
-        compositor::{get_parent, with_states, CompositorClientState, CompositorState},
+        compositor::{CompositorClientState, CompositorState, get_parent, with_states},
         dmabuf::DmabufFeedback,
         fractional_scale::{
-            with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
+            FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
         },
         input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
         keyboard_shortcuts_inhibit::{
@@ -101,7 +101,7 @@ use smithay::{
         },
         output::{OutputHandler, OutputManagerState},
         pointer_constraints::{
-            with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
+            PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
         },
         pointer_gestures::PointerGesturesState,
         presentation::PresentationState,
@@ -112,21 +112,21 @@ use smithay::{
             SecurityContextState,
         },
         selection::{
+            SelectionHandler,
             data_device::{
-                set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
-                ServerDndGrabHandler,
+                ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
+                set_data_device_focus,
             },
             primary_selection::{
-                set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
+                PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
             },
             wlr_data_control::{DataControlHandler, DataControlState},
-            SelectionHandler,
         },
         shell::{
             wlr_layer::WlrLayerShellState,
             xdg::{
-                decoration::{XdgDecorationHandler, XdgDecorationState},
                 ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
+                decoration::{XdgDecorationHandler, XdgDecorationState},
             },
         },
         shm::{ShmHandler, ShmState},