From 73fefd9d49fcc88e410703f0eae075773609b539 Mon Sep 17 00:00:00 2001 From: kenoss Date: Wed, 18 Dec 2024 00:34:24 +0900 Subject: [PATCH] for f in $(git diff 9f8fcc2f --name-only | grep _2024); do cargo run --bin rustfmt -- $f ; done --- tests/source/5131_crate_2024.rs | 76 +++++++---------------- tests/source/5131_module_2024.rs | 102 ++++++++++--------------------- tests/source/5131_one_2024.rs | 81 ++++++++---------------- tests/target/5131_crate_2024.rs | 44 ++++++------- tests/target/5131_module_2024.rs | 20 +++--- tests/target/5131_one_2024.rs | 44 ++++++------- 6 files changed, 135 insertions(+), 232 deletions(-) diff --git a/tests/source/5131_crate_2024.rs b/tests/source/5131_crate_2024.rs index d7e1ed64ebe..29e652c0e96 100644 --- a/tests/source/5131_crate_2024.rs +++ b/tests/source/5131_crate_2024.rs @@ -14,68 +14,38 @@ use qux::h; use qux::h as h2; use qux::i; - mod indent4 { use column_____________________________________________________________________________________102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_______________________________________________________________________________096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_________________________________________________________________________090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; - use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::c102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, - }; + use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: + c102::{Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz}; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::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, @@ -85,37 +55,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::{ @@ -124,7 +94,7 @@ use smithay::{ }, output::{OutputHandler, OutputManagerState}, pointer_constraints::{ - with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, + PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, }, pointer_gestures::PointerGesturesState, presentation::PresentationState, @@ -135,21 +105,21 @@ use smithay::{ SecurityContextState, }, selection::data_device::{ - set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, - ServerDndGrabHandler, + ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, + set_data_device_focus, }, selection::{ + SelectionHandler, 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/source/5131_module_2024.rs b/tests/source/5131_module_2024.rs index 319e735b3f8..eb0c074e239 100644 --- a/tests/source/5131_module_2024.rs +++ b/tests/source/5131_module_2024.rs @@ -35,59 +35,30 @@ mod a { mod indent4 { use column_____________________________________________________________________________________102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_______________________________________________________________________________096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_________________________________________________________________________090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; - use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::c102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, - }; + use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: + c102::{Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz}; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; // Check that the behavior when "{" exceeds the max column. @@ -95,28 +66,19 @@ mod indent4 { // Note that `shape.offset_left(4)?.sub_width(1)?;` in // `rewrite_reorderable_or_regroupable_items()` replaces the max column 100 by 99. - use x::column______________________________________________________________________________098::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + use x:: + column______________________________________________________________________________098::{ + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; - use x::column__Only_the_last_one_wraps_due_to_brace_______________________________________097::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + use x:: + column__Only_the_last_one_wraps_due_to_brace_______________________________________097::{ + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; - use x::column_____________________________________________________________________________096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + use x:: + column_____________________________________________________________________________096::{ + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; // Test for top-level `UseSegmentKind::List`. @@ -128,7 +90,7 @@ mod indent4 { 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, @@ -138,37 +100,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::{ @@ -177,7 +139,7 @@ use smithay::{ }, output::{OutputHandler, OutputManagerState}, pointer_constraints::{ - with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, + PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, }, pointer_gestures::PointerGesturesState, presentation::PresentationState, @@ -188,21 +150,21 @@ use smithay::{ SecurityContextState, }, selection::data_device::{ - set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, - ServerDndGrabHandler, + ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, + set_data_device_focus, }, selection::{ + SelectionHandler, 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/source/5131_one_2024.rs b/tests/source/5131_one_2024.rs index c981c1bfca0..4ccd932a7ae 100644 --- a/tests/source/5131_one_2024.rs +++ b/tests/source/5131_one_2024.rs @@ -1,9 +1,6 @@ // rustfmt-imports_granularity: One // rustfmt-style_edition: 2024 -pub use foo::x; -pub use foo::x as x2; -pub use foo::y; use bar::a; use bar::b; use bar::b::f; @@ -12,70 +9,44 @@ use bar::b::g; use bar::c; use bar::d::e; use bar::d::e as e2; +pub use foo::x; +pub use foo::x as x2; +pub use foo::y; use qux::h; use qux::i; mod indent4 { use column_____________________________________________________________________________________102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_______________________________________________________________________________096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use column_________________________________________________________________________090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; - use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::c102::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, - }; + use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: + c102::{Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz}; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz, }; use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ - Foo, - bar::Bar, - bar::baz::Baz, - Foo2, - bar::Bar2, + Foo, Foo2, bar::Bar, bar::Bar2, bar::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, @@ -85,37 +56,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::{ @@ -124,7 +95,7 @@ use smithay::{ }, output::{OutputHandler, OutputManagerState}, pointer_constraints::{ - with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, + PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, }, pointer_gestures::PointerGesturesState, presentation::PresentationState, @@ -135,21 +106,21 @@ use smithay::{ SecurityContextState, }, selection::data_device::{ - set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, - ServerDndGrabHandler, + ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, + set_data_device_focus, }, selection::{ + SelectionHandler, 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_crate_2024.rs b/tests/target/5131_crate_2024.rs index 5a3503ce2dc..6545dfa237d 100644 --- 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 index 6315a60bab2..8ea60be633f 100644 --- 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,11 +154,11 @@ 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::{ @@ -166,7 +166,7 @@ use smithay::wayland::keyboard_shortcuts_inhibit::{ }; 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 index 2cbd2252f27..d126606eb02 100644 --- 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},