Skip to content

Commit

Permalink
for f in $(git diff 9f8fcc2 --name-only | grep _2024); do cargo run -…
Browse files Browse the repository at this point in the history 
…-bin rustfmt -- $f ; done
  • Loading branch information
@kenoss
kenoss committed Dec 17, 2024
1 parent 1d1fb66 commit 73fefd9
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 232 deletions.
76 changes: 23 additions & 53 deletions tests/source/5131_crate_2024.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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::{
Expand All @@ -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,
Expand All @@ -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},
Expand Down
102 changes: 32 additions & 70 deletions tests/source/5131_module_2024.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,88 +35,50 @@ 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.
//
// 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`.
Expand All @@ -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,
Expand All @@ -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::{
Expand All @@ -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,
Expand All @@ -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},
Expand Down
Loading

0 comments on commit 73fefd9

Please sign in to comment.