Skip to content

Commit cca35a3

Browse files
kenosskenoss
committed
for f in $(git diff 9f8fcc2 --name-only | pcregrep 'target/.*_2024'); do cargo run --bin rustfmt -- $f ; done
1 parent 6c94a80 commit cca35a3

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎tests/target/5131_crate_2024.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@ use qux::{h, h as h2, i};
1111

1212
mod indent4 {
1313
use column_____________________________________________________________________________________102::{
14-
bar::{baz::Baz, Bar, Bar2},
1514
Foo, Foo2,
15+
bar::{Bar, Bar2, baz::Baz},
1616
};
1717

1818
use column_______________________________________________________________________________096::{
19-
bar::{baz::Baz, Bar, Bar2},
2019
Foo, Foo2,
20+
bar::{Bar, Bar2, baz::Baz},
2121
};
2222

2323
use column_________________________________________________________________________090::{
24-
bar::{baz::Baz, Bar, Bar2},
2524
Foo, Foo2,
25+
bar::{Bar, Bar2, baz::Baz},
2626
};
2727

2828
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
2929
c102::{
30-
bar::{baz::Baz, Bar, Bar2},
3130
Foo, Foo2,
31+
bar::{Bar, Bar2, baz::Baz},
3232
};
3333

3434
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
35-
bar::{baz::Baz, Bar, Bar2},
3635
Foo, Foo2,
36+
bar::{Bar, Bar2, baz::Baz},
3737
};
3838

3939
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
40-
bar::{baz::Baz, Bar, Bar2},
4140
Foo, Foo2,
41+
bar::{Bar, Bar2, baz::Baz},
4242
};
4343

4444
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
45-
bar::{baz::Baz, Bar, Bar2},
4645
Foo, Foo2,
46+
bar::{Bar, Bar2, baz::Baz},
4747
};
4848
}
4949

5050
use smithay::{
5151
backend::renderer::element::{
52-
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
52+
RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
5353
},
5454
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
5555
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -59,37 +59,37 @@ use smithay::{
5959
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
6060
delegate_xdg_decoration, delegate_xdg_shell,
6161
desktop::{
62+
PopupKind, PopupManager, Space,
6263
space::SpaceElement,
6364
utils::{
64-
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
65-
update_surface_primary_scanout_output, OutputPresentationFeedback,
65+
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
66+
surface_primary_scanout_output, update_surface_primary_scanout_output,
6667
},
67-
PopupKind, PopupManager, Space,
6868
},
6969
input::{
70+
Seat, SeatHandler, SeatState,
7071
keyboard::{Keysym, LedState, XkbConfig},
7172
pointer::{CursorImageStatus, PointerHandle},
72-
Seat, SeatHandler, SeatState,
7373
},
7474
output::Output,
7575
reexports::{
76-
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
76+
calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
7777
wayland_protocols::xdg::decoration::{
7878
self as xdg_decoration,
7979
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
8080
},
8181
wayland_server::{
82+
Display, DisplayHandle, Resource,
8283
backend::{ClientData, ClientId, DisconnectReason},
8384
protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
84-
Display, DisplayHandle, Resource,
8585
},
8686
},
8787
utils::{Clock, Monotonic, Rectangle},
8888
wayland::{
89-
compositor::{get_parent, with_states, CompositorClientState, CompositorState},
89+
compositor::{CompositorClientState, CompositorState, get_parent, with_states},
9090
dmabuf::DmabufFeedback,
9191
fractional_scale::{
92-
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
92+
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
9393
},
9494
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
9595
keyboard_shortcuts_inhibit::{
@@ -98,7 +98,7 @@ use smithay::{
9898
},
9999
output::{OutputHandler, OutputManagerState},
100100
pointer_constraints::{
101-
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
101+
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
102102
},
103103
pointer_gestures::PointerGesturesState,
104104
presentation::PresentationState,
@@ -109,21 +109,21 @@ use smithay::{
109109
SecurityContextState,
110110
},
111111
selection::{
112+
SelectionHandler,
112113
data_device::{
113-
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
114-
ServerDndGrabHandler,
114+
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
115+
set_data_device_focus,
115116
},
116117
primary_selection::{
117-
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
118+
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
118119
},
119120
wlr_data_control::{DataControlHandler, DataControlState},
120-
SelectionHandler,
121121
},
122122
shell::{
123123
wlr_layer::WlrLayerShellState,
124124
xdg::{
125-
decoration::{XdgDecorationHandler, XdgDecorationState},
126125
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
126+
decoration::{XdgDecorationHandler, XdgDecorationState},
127127
},
128128
},
129129
shm::{ShmHandler, ShmState},

‎tests/target/5131_module_2024.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ mod indent4 {
131131

132132
use smithay::backend::renderer::element::utils::select_dmabuf_feedback;
133133
use smithay::backend::renderer::element::{
134-
default_primary_scanout_output_compare, RenderElementStates,
134+
RenderElementStates, default_primary_scanout_output_compare,
135135
};
136136
use smithay::desktop::space::SpaceElement;
137137
use smithay::desktop::utils::{
138-
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
139-
update_surface_primary_scanout_output, OutputPresentationFeedback,
138+
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
139+
surface_primary_scanout_output, update_surface_primary_scanout_output,
140140
};
141141
use smithay::desktop::{PopupKind, PopupManager, Space};
142142
use smithay::input::keyboard::{Keysym, LedState, XkbConfig};
@@ -154,19 +154,19 @@ use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
154154
use smithay::reexports::wayland_server::{Display, DisplayHandle, Resource};
155155
use smithay::utils::{Clock, Monotonic, Rectangle};
156156
use smithay::wayland::compositor::{
157-
get_parent, with_states, CompositorClientState, CompositorState,
157+
CompositorClientState, CompositorState, get_parent, with_states,
158158
};
159159
use smithay::wayland::dmabuf::DmabufFeedback;
160160
use smithay::wayland::fractional_scale::{
161-
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
161+
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
162162
};
163163
use smithay::wayland::input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface};
164164
use smithay::wayland::keyboard_shortcuts_inhibit::{
165165
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, KeyboardShortcutsInhibitor,
166166
};
167167
use smithay::wayland::output::{OutputHandler, OutputManagerState};
168168
use smithay::wayland::pointer_constraints::{
169-
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
169+
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
170170
};
171171
use smithay::wayland::pointer_gestures::PointerGesturesState;
172172
use smithay::wayland::presentation::PresentationState;
@@ -175,15 +175,15 @@ use smithay::wayland::seat::WaylandFocus;
175175
use smithay::wayland::security_context::{
176176
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, SecurityContextState,
177177
};
178+
use smithay::wayland::selection::SelectionHandler;
178179
use smithay::wayland::selection::data_device::{
179-
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
180-
ServerDndGrabHandler,
180+
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
181+
set_data_device_focus,
181182
};
182183
use smithay::wayland::selection::primary_selection::{
183-
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
184+
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
184185
};
185186
use smithay::wayland::selection::wlr_data_control::{DataControlHandler, DataControlState};
186-
use smithay::wayland::selection::SelectionHandler;
187187
use smithay::wayland::shell::wlr_layer::WlrLayerShellState;
188188
use smithay::wayland::shell::xdg::decoration::{XdgDecorationHandler, XdgDecorationState};
189189
use smithay::wayland::shell::xdg::{ToplevelSurface, XdgShellState, XdgToplevelSurfaceData};

‎tests/target/5131_one_2024.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,45 @@ use {
1414

1515
mod indent4 {
1616
use column_____________________________________________________________________________________102::{
17-
bar::{baz::Baz, Bar, Bar2},
1817
Foo, Foo2,
18+
bar::{Bar, Bar2, baz::Baz},
1919
};
2020

2121
use column_______________________________________________________________________________096::{
22-
bar::{baz::Baz, Bar, Bar2},
2322
Foo, Foo2,
23+
bar::{Bar, Bar2, baz::Baz},
2424
};
2525

2626
use column_________________________________________________________________________090::{
27-
bar::{baz::Baz, Bar, Bar2},
2827
Foo, Foo2,
28+
bar::{Bar, Bar2, baz::Baz},
2929
};
3030

3131
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
3232
c102::{
33-
bar::{baz::Baz, Bar, Bar2},
3433
Foo, Foo2,
34+
bar::{Bar, Bar2, baz::Baz},
3535
};
3636

3737
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
38-
bar::{baz::Baz, Bar, Bar2},
3938
Foo, Foo2,
39+
bar::{Bar, Bar2, baz::Baz},
4040
};
4141

4242
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
43-
bar::{baz::Baz, Bar, Bar2},
4443
Foo, Foo2,
44+
bar::{Bar, Bar2, baz::Baz},
4545
};
4646

4747
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
48-
bar::{baz::Baz, Bar, Bar2},
4948
Foo, Foo2,
49+
bar::{Bar, Bar2, baz::Baz},
5050
};
5151
}
5252

5353
use smithay::{
5454
backend::renderer::element::{
55-
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
55+
RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
5656
},
5757
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
5858
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -62,37 +62,37 @@ use smithay::{
6262
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
6363
delegate_xdg_decoration, delegate_xdg_shell,
6464
desktop::{
65+
PopupKind, PopupManager, Space,
6566
space::SpaceElement,
6667
utils::{
67-
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
68-
update_surface_primary_scanout_output, OutputPresentationFeedback,
68+
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
69+
surface_primary_scanout_output, update_surface_primary_scanout_output,
6970
},
70-
PopupKind, PopupManager, Space,
7171
},
7272
input::{
73+
Seat, SeatHandler, SeatState,
7374
keyboard::{Keysym, LedState, XkbConfig},
7475
pointer::{CursorImageStatus, PointerHandle},
75-
Seat, SeatHandler, SeatState,
7676
},
7777
output::Output,
7878
reexports::{
79-
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
79+
calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
8080
wayland_protocols::xdg::decoration::{
8181
self as xdg_decoration,
8282
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
8383
},
8484
wayland_server::{
85+
Display, DisplayHandle, Resource,
8586
backend::{ClientData, ClientId, DisconnectReason},
8687
protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
87-
Display, DisplayHandle, Resource,
8888
},
8989
},
9090
utils::{Clock, Monotonic, Rectangle},
9191
wayland::{
92-
compositor::{get_parent, with_states, CompositorClientState, CompositorState},
92+
compositor::{CompositorClientState, CompositorState, get_parent, with_states},
9393
dmabuf::DmabufFeedback,
9494
fractional_scale::{
95-
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
95+
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
9696
},
9797
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
9898
keyboard_shortcuts_inhibit::{
@@ -101,7 +101,7 @@ use smithay::{
101101
},
102102
output::{OutputHandler, OutputManagerState},
103103
pointer_constraints::{
104-
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
104+
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
105105
},
106106
pointer_gestures::PointerGesturesState,
107107
presentation::PresentationState,
@@ -112,21 +112,21 @@ use smithay::{
112112
SecurityContextState,
113113
},
114114
selection::{
115+
SelectionHandler,
115116
data_device::{
116-
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
117-
ServerDndGrabHandler,
117+
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
118+
set_data_device_focus,
118119
},
119120
primary_selection::{
120-
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
121+
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
121122
},
122123
wlr_data_control::{DataControlHandler, DataControlState},
123-
SelectionHandler,
124124
},
125125
shell::{
126126
wlr_layer::WlrLayerShellState,
127127
xdg::{
128-
decoration::{XdgDecorationHandler, XdgDecorationState},
129128
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
129+
decoration::{XdgDecorationHandler, XdgDecorationState},
130130
},
131131
},
132132
shm::{ShmHandler, ShmState},

0 commit comments

Comments
 (0)