Skip to content

Commit 73fefd9

Browse files
kenosskenoss
committed
for f in $(git diff 9f8fcc2 --name-only | grep _2024); do cargo run --bin rustfmt -- $f ; done
1 parent 1d1fb66 commit 73fefd9

File tree

6 files changed

+135
-232
lines changed

6 files changed

+135
-232
lines changed

Diff for: ‎tests/source/5131_crate_2024.rs

+23-53
Original file line numberDiff line numberDiff line change
@@ -14,68 +14,38 @@ use qux::h;
1414
use qux::h as h2;
1515
use qux::i;
1616

17-
1817
mod indent4 {
1918
use column_____________________________________________________________________________________102::{
20-
Foo,
21-
bar::Bar,
22-
bar::baz::Baz,
23-
Foo2,
24-
bar::Bar2,
19+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
2520
};
2621

2722
use column_______________________________________________________________________________096::{
28-
Foo,
29-
bar::Bar,
30-
bar::baz::Baz,
31-
Foo2,
32-
bar::Bar2,
23+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
3324
};
3425

3526
use column_________________________________________________________________________090::{
36-
Foo,
37-
bar::Bar,
38-
bar::baz::Baz,
39-
Foo2,
40-
bar::Bar2,
27+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
4128
};
4229

43-
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::c102::{
44-
Foo,
45-
bar::Bar,
46-
bar::baz::Baz,
47-
Foo2,
48-
bar::Bar2,
49-
};
30+
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
31+
c102::{Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz};
5032

5133
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
52-
Foo,
53-
bar::Bar,
54-
bar::baz::Baz,
55-
Foo2,
56-
bar::Bar2,
34+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
5735
};
5836

5937
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
60-
Foo,
61-
bar::Bar,
62-
bar::baz::Baz,
63-
Foo2,
64-
bar::Bar2,
38+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
6539
};
6640

6741
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
68-
Foo,
69-
bar::Bar,
70-
bar::baz::Baz,
71-
Foo2,
72-
bar::Bar2,
42+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
7343
};
7444
}
7545

7646
use smithay::{
7747
backend::renderer::element::{
78-
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
48+
RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
7949
},
8050
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
8151
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -85,37 +55,37 @@ use smithay::{
8555
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
8656
delegate_xdg_decoration, delegate_xdg_shell,
8757
desktop::{
58+
PopupKind, PopupManager, Space,
8859
space::SpaceElement,
8960
utils::{
90-
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
91-
update_surface_primary_scanout_output, OutputPresentationFeedback,
61+
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
62+
surface_primary_scanout_output, update_surface_primary_scanout_output,
9263
},
93-
PopupKind, PopupManager, Space,
9464
},
9565
input::{
66+
Seat, SeatHandler, SeatState,
9667
keyboard::{Keysym, LedState, XkbConfig},
9768
pointer::{CursorImageStatus, PointerHandle},
98-
Seat, SeatHandler, SeatState,
9969
},
10070
output::Output,
10171
reexports::{
102-
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
72+
calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
10373
wayland_protocols::xdg::decoration::{
10474
self as xdg_decoration,
10575
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
10676
},
10777
wayland_server::{
78+
Display, DisplayHandle, Resource,
10879
backend::{ClientData, ClientId, DisconnectReason},
10980
protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
110-
Display, DisplayHandle, Resource,
11181
},
11282
},
11383
utils::{Clock, Monotonic, Rectangle},
11484
wayland::{
115-
compositor::{get_parent, with_states, CompositorClientState, CompositorState},
85+
compositor::{CompositorClientState, CompositorState, get_parent, with_states},
11686
dmabuf::DmabufFeedback,
11787
fractional_scale::{
118-
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
88+
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
11989
},
12090
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
12191
keyboard_shortcuts_inhibit::{
@@ -124,7 +94,7 @@ use smithay::{
12494
},
12595
output::{OutputHandler, OutputManagerState},
12696
pointer_constraints::{
127-
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
97+
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
12898
},
12999
pointer_gestures::PointerGesturesState,
130100
presentation::PresentationState,
@@ -135,21 +105,21 @@ use smithay::{
135105
SecurityContextState,
136106
},
137107
selection::data_device::{
138-
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
139-
ServerDndGrabHandler,
108+
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
109+
set_data_device_focus,
140110
},
141111
selection::{
112+
SelectionHandler,
142113
primary_selection::{
143-
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
114+
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
144115
},
145116
wlr_data_control::{DataControlHandler, DataControlState},
146-
SelectionHandler,
147117
},
148118
shell::{
149119
wlr_layer::WlrLayerShellState,
150120
xdg::{
151-
decoration::{XdgDecorationHandler, XdgDecorationState},
152121
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
122+
decoration::{XdgDecorationHandler, XdgDecorationState},
153123
},
154124
},
155125
shm::{ShmHandler, ShmState},

Diff for: ‎tests/source/5131_module_2024.rs

+32-70
Original file line numberDiff line numberDiff line change
@@ -35,88 +35,50 @@ mod a {
3535

3636
mod indent4 {
3737
use column_____________________________________________________________________________________102::{
38-
Foo,
39-
bar::Bar,
40-
bar::baz::Baz,
41-
Foo2,
42-
bar::Bar2,
38+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
4339
};
4440

4541
use column_______________________________________________________________________________096::{
46-
Foo,
47-
bar::Bar,
48-
bar::baz::Baz,
49-
Foo2,
50-
bar::Bar2,
42+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
5143
};
5244

5345
use column_________________________________________________________________________090::{
54-
Foo,
55-
bar::Bar,
56-
bar::baz::Baz,
57-
Foo2,
58-
bar::Bar2,
46+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
5947
};
6048

61-
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::c102::{
62-
Foo,
63-
bar::Bar,
64-
bar::baz::Baz,
65-
Foo2,
66-
bar::Bar2,
67-
};
49+
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::
50+
c102::{Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz};
6851

6952
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{
70-
Foo,
71-
bar::Bar,
72-
bar::baz::Baz,
73-
Foo2,
74-
bar::Bar2,
53+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
7554
};
7655

7756
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{
78-
Foo,
79-
bar::Bar,
80-
bar::baz::Baz,
81-
Foo2,
82-
bar::Bar2,
57+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
8358
};
8459

8560
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{
86-
Foo,
87-
bar::Bar,
88-
bar::baz::Baz,
89-
Foo2,
90-
bar::Bar2,
61+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
9162
};
9263

9364
// Check that the behavior when "{" exceeds the max column.
9465
//
9566
// Note that `shape.offset_left(4)?.sub_width(1)?;` in
9667
// `rewrite_reorderable_or_regroupable_items()` replaces the max column 100 by 99.
9768

98-
use x::column______________________________________________________________________________098::{
99-
Foo,
100-
bar::Bar,
101-
bar::baz::Baz,
102-
Foo2,
103-
bar::Bar2,
69+
use x::
70+
column______________________________________________________________________________098::{
71+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
10472
};
10573

106-
use x::column__Only_the_last_one_wraps_due_to_brace_______________________________________097::{
107-
Foo,
108-
bar::Bar,
109-
bar::baz::Baz,
110-
Foo2,
111-
bar::Bar2,
74+
use x::
75+
column__Only_the_last_one_wraps_due_to_brace_______________________________________097::{
76+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
11277
};
11378

114-
use x::column_____________________________________________________________________________096::{
115-
Foo,
116-
bar::Bar,
117-
bar::baz::Baz,
118-
Foo2,
119-
bar::Bar2,
79+
use x::
80+
column_____________________________________________________________________________096::{
81+
Foo, Foo2, bar::Bar, bar::Bar2, bar::baz::Baz,
12082
};
12183

12284
// Test for top-level `UseSegmentKind::List`.
@@ -128,7 +90,7 @@ mod indent4 {
12890

12991
use smithay::{
13092
backend::renderer::element::{
131-
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
93+
RenderElementStates, default_primary_scanout_output_compare, utils::select_dmabuf_feedback,
13294
},
13395
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
13496
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
@@ -138,37 +100,37 @@ use smithay::{
138100
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation,
139101
delegate_xdg_decoration, delegate_xdg_shell,
140102
desktop::{
103+
PopupKind, PopupManager, Space,
141104
space::SpaceElement,
142105
utils::{
143-
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output,
144-
update_surface_primary_scanout_output, OutputPresentationFeedback,
106+
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states,
107+
surface_primary_scanout_output, update_surface_primary_scanout_output,
145108
},
146-
PopupKind, PopupManager, Space,
147109
},
148110
input::{
111+
Seat, SeatHandler, SeatState,
149112
keyboard::{Keysym, LedState, XkbConfig},
150113
pointer::{CursorImageStatus, PointerHandle},
151-
Seat, SeatHandler, SeatState,
152114
},
153115
output::Output,
154116
reexports::{
155-
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction},
117+
calloop::{Interest, LoopHandle, Mode, PostAction, generic::Generic},
156118
wayland_protocols::xdg::decoration::{
157119
self as xdg_decoration,
158120
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode,
159121
},
160122
wayland_server::{
123+
Display, DisplayHandle, Resource,
161124
backend::{ClientData, ClientId, DisconnectReason},
162125
protocol::{wl_data_source::WlDataSource, wl_surface::WlSurface},
163-
Display, DisplayHandle, Resource,
164126
},
165127
},
166128
utils::{Clock, Monotonic, Rectangle},
167129
wayland::{
168-
compositor::{get_parent, with_states, CompositorClientState, CompositorState},
130+
compositor::{CompositorClientState, CompositorState, get_parent, with_states},
169131
dmabuf::DmabufFeedback,
170132
fractional_scale::{
171-
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState,
133+
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale,
172134
},
173135
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
174136
keyboard_shortcuts_inhibit::{
@@ -177,7 +139,7 @@ use smithay::{
177139
},
178140
output::{OutputHandler, OutputManagerState},
179141
pointer_constraints::{
180-
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState,
142+
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint,
181143
},
182144
pointer_gestures::PointerGesturesState,
183145
presentation::PresentationState,
@@ -188,21 +150,21 @@ use smithay::{
188150
SecurityContextState,
189151
},
190152
selection::data_device::{
191-
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
192-
ServerDndGrabHandler,
153+
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
154+
set_data_device_focus,
193155
},
194156
selection::{
157+
SelectionHandler,
195158
primary_selection::{
196-
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState,
159+
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
197160
},
198161
wlr_data_control::{DataControlHandler, DataControlState},
199-
SelectionHandler,
200162
},
201163
shell::{
202164
wlr_layer::WlrLayerShellState,
203165
xdg::{
204-
decoration::{XdgDecorationHandler, XdgDecorationState},
205166
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
167+
decoration::{XdgDecorationHandler, XdgDecorationState},
206168
},
207169
},
208170
shm::{ShmHandler, ShmState},

0 commit comments

Comments
 (0)