-
Notifications
You must be signed in to change notification settings - Fork 932
fix #6164: Reduce format failure for non default imports_granularity
#6165
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -286,10 +286,21 @@ impl Shape { | |
.ok_or_else(|| self.exceeds_max_width_error(span)) | ||
} | ||
|
||
pub(crate) fn add_width(&self, width: usize) -> Shape { | ||
Shape { | ||
width: self.width + width, | ||
..*self | ||
} | ||
} | ||
Comment on lines
+289
to
+294
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you explain a little more why we needed to implement an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider this case:
Look at the
Let's trace the behavior of the format above.
Alternative options:
We can't do that because it produces
It's not simple compared to adding So, I added |
||
|
||
pub(crate) fn offset_left_opt(&self, delta: usize) -> Option<Shape> { | ||
self.add_offset(delta).sub_width_opt(delta) | ||
} | ||
|
||
pub(crate) fn offset_left_maybe_overflow(&self, width: usize) -> Shape { | ||
self.add_offset(width).saturating_sub_width(width) | ||
} | ||
Comment on lines
+300
to
+302
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similarly, can you explain what There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar. There are the cases that we need to allow overflow temporarily. We can proceed |
||
|
||
pub(crate) fn used_width(&self) -> usize { | ||
self.indent.block_indent + self.offset | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
// rustfmt-imports_granularity: Crate | ||
// rustfmt-style_edition: 2024 | ||
|
||
use foo::a; | ||
use foo::a; | ||
use foo::b; | ||
use foo::b as b2; | ||
use foo::b::f; | ||
use foo::b::g; | ||
use foo::b::g as g2; | ||
use foo::c; | ||
use foo::d::e; | ||
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, | ||
}; | ||
|
||
use column_______________________________________________________________________________096::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use column_________________________________________________________________________090::{ | ||
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, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
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, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
} | ||
|
||
use smithay::{ | ||
backend::renderer::element::{ | ||
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates, | ||
}, | ||
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale, | ||
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
desktop::{ | ||
space::SpaceElement, | ||
utils::{ | ||
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output, | ||
update_surface_primary_scanout_output, OutputPresentationFeedback, | ||
}, | ||
PopupKind, PopupManager, Space, | ||
}, | ||
input::{ | ||
keyboard::{Keysym, LedState, XkbConfig}, | ||
pointer::{CursorImageStatus, PointerHandle}, | ||
Seat, SeatHandler, SeatState, | ||
}, | ||
output::Output, | ||
reexports::{ | ||
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction}, | ||
wayland_protocols::xdg::decoration::{ | ||
self as xdg_decoration, | ||
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode, | ||
}, | ||
wayland_server::{ | ||
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}, | ||
dmabuf::DmabufFeedback, | ||
fractional_scale::{ | ||
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState, | ||
}, | ||
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface}, | ||
keyboard_shortcuts_inhibit::{ | ||
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, | ||
KeyboardShortcutsInhibitor, | ||
}, | ||
output::{OutputHandler, OutputManagerState}, | ||
pointer_constraints::{ | ||
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, | ||
}, | ||
pointer_gestures::PointerGesturesState, | ||
presentation::PresentationState, | ||
relative_pointer::RelativePointerManagerState, | ||
seat::WaylandFocus, | ||
security_context::{ | ||
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, | ||
SecurityContextState, | ||
}, | ||
selection::data_device::{ | ||
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, | ||
ServerDndGrabHandler, | ||
}, | ||
selection::{ | ||
primary_selection::{ | ||
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState, | ||
}, | ||
wlr_data_control::{DataControlHandler, DataControlState}, | ||
SelectionHandler, | ||
}, | ||
shell::{ | ||
wlr_layer::WlrLayerShellState, | ||
xdg::{ | ||
decoration::{XdgDecorationHandler, XdgDecorationState}, | ||
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData, | ||
}, | ||
}, | ||
shm::{ShmHandler, ShmState}, | ||
socket::ListeningSocketSource, | ||
tablet_manager::{TabletManagerState, TabletSeatTrait}, | ||
text_input::TextInputManagerState, | ||
viewporter::ViewporterState, | ||
virtual_keyboard::VirtualKeyboardManagerState, | ||
xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}, | ||
xdg_foreign::{XdgForeignHandler, XdgForeignState}, | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,219 @@ | ||
// rustfmt-imports_granularity: Module | ||
// rustfmt-style_edition: 2024 | ||
|
||
#![allow(dead_code)] | ||
|
||
mod a { | ||
pub mod b { | ||
pub struct Data { | ||
pub a: i32, | ||
} | ||
} | ||
|
||
use crate::a::b::Data; | ||
use crate::a::b::Data as Data2; | ||
|
||
pub fn data(a: i32) -> Data { | ||
Data { a } | ||
} | ||
|
||
pub fn data2(a: i32) -> Data2 { | ||
Data2 { a } | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
|
||
#[test] | ||
pub fn test() { | ||
data(1); | ||
data2(1); | ||
} | ||
} | ||
} | ||
|
||
mod indent4 { | ||
use column_____________________________________________________________________________________102::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use column_______________________________________________________________________________096::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use column_________________________________________________________________________090::{ | ||
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, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
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, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
// 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__Only_the_last_one_wraps_due_to_brace_______________________________________097::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use x::column_____________________________________________________________________________096::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
// Test for top-level `UseSegmentKind::List`. | ||
use { | ||
a, | ||
column_____________________________________________________________________________________102, | ||
}; | ||
} | ||
|
||
use smithay::{ | ||
backend::renderer::element::{ | ||
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates, | ||
}, | ||
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale, | ||
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
desktop::{ | ||
space::SpaceElement, | ||
utils::{ | ||
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output, | ||
update_surface_primary_scanout_output, OutputPresentationFeedback, | ||
}, | ||
PopupKind, PopupManager, Space, | ||
}, | ||
input::{ | ||
keyboard::{Keysym, LedState, XkbConfig}, | ||
pointer::{CursorImageStatus, PointerHandle}, | ||
Seat, SeatHandler, SeatState, | ||
}, | ||
output::Output, | ||
reexports::{ | ||
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction}, | ||
wayland_protocols::xdg::decoration::{ | ||
self as xdg_decoration, | ||
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode, | ||
}, | ||
wayland_server::{ | ||
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}, | ||
dmabuf::DmabufFeedback, | ||
fractional_scale::{ | ||
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState, | ||
}, | ||
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface}, | ||
keyboard_shortcuts_inhibit::{ | ||
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, | ||
KeyboardShortcutsInhibitor, | ||
}, | ||
output::{OutputHandler, OutputManagerState}, | ||
pointer_constraints::{ | ||
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, | ||
}, | ||
pointer_gestures::PointerGesturesState, | ||
presentation::PresentationState, | ||
relative_pointer::RelativePointerManagerState, | ||
seat::WaylandFocus, | ||
security_context::{ | ||
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, | ||
SecurityContextState, | ||
}, | ||
selection::data_device::{ | ||
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, | ||
ServerDndGrabHandler, | ||
}, | ||
selection::{ | ||
primary_selection::{ | ||
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState, | ||
}, | ||
wlr_data_control::{DataControlHandler, DataControlState}, | ||
SelectionHandler, | ||
}, | ||
shell::{ | ||
wlr_layer::WlrLayerShellState, | ||
xdg::{ | ||
decoration::{XdgDecorationHandler, XdgDecorationState}, | ||
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData, | ||
}, | ||
}, | ||
shm::{ShmHandler, ShmState}, | ||
socket::ListeningSocketSource, | ||
tablet_manager::{TabletManagerState, TabletSeatTrait}, | ||
text_input::TextInputManagerState, | ||
viewporter::ViewporterState, | ||
virtual_keyboard::VirtualKeyboardManagerState, | ||
xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}, | ||
xdg_foreign::{XdgForeignHandler, XdgForeignState}, | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
// 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; | ||
use bar::b::f as f2; | ||
use bar::b::g; | ||
use bar::c; | ||
use bar::d::e; | ||
use bar::d::e as e2; | ||
use qux::h; | ||
use qux::i; | ||
|
||
mod indent4 { | ||
use column_____________________________________________________________________________________102::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use column_______________________________________________________________________________096::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use column_________________________________________________________________________090::{ | ||
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, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
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, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ | ||
Foo, | ||
bar::Bar, | ||
bar::baz::Baz, | ||
Foo2, | ||
bar::Bar2, | ||
}; | ||
} | ||
|
||
use smithay::{ | ||
backend::renderer::element::{ | ||
default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates, | ||
}, | ||
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale, | ||
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
desktop::{ | ||
space::SpaceElement, | ||
utils::{ | ||
surface_presentation_feedback_flags_from_states, surface_primary_scanout_output, | ||
update_surface_primary_scanout_output, OutputPresentationFeedback, | ||
}, | ||
PopupKind, PopupManager, Space, | ||
}, | ||
input::{ | ||
keyboard::{Keysym, LedState, XkbConfig}, | ||
pointer::{CursorImageStatus, PointerHandle}, | ||
Seat, SeatHandler, SeatState, | ||
}, | ||
output::Output, | ||
reexports::{ | ||
calloop::{generic::Generic, Interest, LoopHandle, Mode, PostAction}, | ||
wayland_protocols::xdg::decoration::{ | ||
self as xdg_decoration, | ||
zv1::server::zxdg_toplevel_decoration_v1::Mode as DecorationMode, | ||
}, | ||
wayland_server::{ | ||
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}, | ||
dmabuf::DmabufFeedback, | ||
fractional_scale::{ | ||
with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState, | ||
}, | ||
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface}, | ||
keyboard_shortcuts_inhibit::{ | ||
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, | ||
KeyboardShortcutsInhibitor, | ||
}, | ||
output::{OutputHandler, OutputManagerState}, | ||
pointer_constraints::{ | ||
with_pointer_constraint, PointerConstraintsHandler, PointerConstraintsState, | ||
}, | ||
pointer_gestures::PointerGesturesState, | ||
presentation::PresentationState, | ||
relative_pointer::RelativePointerManagerState, | ||
seat::WaylandFocus, | ||
security_context::{ | ||
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, | ||
SecurityContextState, | ||
}, | ||
selection::data_device::{ | ||
set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, | ||
ServerDndGrabHandler, | ||
}, | ||
selection::{ | ||
primary_selection::{ | ||
set_primary_focus, PrimarySelectionHandler, PrimarySelectionState, | ||
}, | ||
wlr_data_control::{DataControlHandler, DataControlState}, | ||
SelectionHandler, | ||
}, | ||
shell::{ | ||
wlr_layer::WlrLayerShellState, | ||
xdg::{ | ||
decoration::{XdgDecorationHandler, XdgDecorationState}, | ||
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData, | ||
}, | ||
}, | ||
shm::{ShmHandler, ShmState}, | ||
socket::ListeningSocketSource, | ||
tablet_manager::{TabletManagerState, TabletSeatTrait}, | ||
text_input::TextInputManagerState, | ||
viewporter::ViewporterState, | ||
virtual_keyboard::VirtualKeyboardManagerState, | ||
xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}, | ||
xdg_foreign::{XdgForeignHandler, XdgForeignState}, | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
// rustfmt-imports_granularity: Crate | ||
// rustfmt-style_edition: 2024 | ||
|
||
use foo::{ | ||
a, b, b as b2, | ||
b::{f, g, g as g2}, | ||
c, | ||
d::e, | ||
}; | ||
use qux::{h, h as h2, i}; | ||
|
||
mod indent4 { | ||
use column_____________________________________________________________________________________102::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use column_______________________________________________________________________________096::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use column_________________________________________________________________________090::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c102::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
} | ||
|
||
use smithay::{ | ||
backend::renderer::element::{ | ||
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, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
desktop::{ | ||
PopupKind, PopupManager, Space, | ||
space::SpaceElement, | ||
utils::{ | ||
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states, | ||
surface_primary_scanout_output, update_surface_primary_scanout_output, | ||
}, | ||
}, | ||
input::{ | ||
Seat, SeatHandler, SeatState, | ||
keyboard::{Keysym, LedState, XkbConfig}, | ||
pointer::{CursorImageStatus, PointerHandle}, | ||
}, | ||
output::Output, | ||
reexports::{ | ||
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}, | ||
}, | ||
}, | ||
utils::{Clock, Monotonic, Rectangle}, | ||
wayland::{ | ||
compositor::{CompositorClientState, CompositorState, get_parent, with_states}, | ||
dmabuf::DmabufFeedback, | ||
fractional_scale::{ | ||
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale, | ||
}, | ||
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface}, | ||
keyboard_shortcuts_inhibit::{ | ||
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, | ||
KeyboardShortcutsInhibitor, | ||
}, | ||
output::{OutputHandler, OutputManagerState}, | ||
pointer_constraints::{ | ||
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, | ||
}, | ||
pointer_gestures::PointerGesturesState, | ||
presentation::PresentationState, | ||
relative_pointer::RelativePointerManagerState, | ||
seat::WaylandFocus, | ||
security_context::{ | ||
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, | ||
SecurityContextState, | ||
}, | ||
selection::{ | ||
SelectionHandler, | ||
data_device::{ | ||
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, | ||
set_data_device_focus, | ||
}, | ||
primary_selection::{ | ||
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus, | ||
}, | ||
wlr_data_control::{DataControlHandler, DataControlState}, | ||
}, | ||
shell::{ | ||
wlr_layer::WlrLayerShellState, | ||
xdg::{ | ||
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData, | ||
decoration::{XdgDecorationHandler, XdgDecorationState}, | ||
}, | ||
}, | ||
shm::{ShmHandler, ShmState}, | ||
socket::ListeningSocketSource, | ||
tablet_manager::{TabletManagerState, TabletSeatTrait}, | ||
text_input::TextInputManagerState, | ||
viewporter::ViewporterState, | ||
virtual_keyboard::VirtualKeyboardManagerState, | ||
xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}, | ||
xdg_foreign::{XdgForeignHandler, XdgForeignState}, | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,208 @@ | ||
// rustfmt-imports_granularity: Module | ||
// rustfmt-style_edition: 2024 | ||
|
||
#![allow(dead_code)] | ||
|
||
mod a { | ||
pub mod b { | ||
pub struct Data { | ||
pub a: i32, | ||
} | ||
} | ||
|
||
use crate::a::b::{Data, Data as Data2}; | ||
|
||
pub fn data(a: i32) -> Data { | ||
Data { a } | ||
} | ||
|
||
pub fn data2(a: i32) -> Data2 { | ||
Data2 { a } | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
|
||
#[test] | ||
pub fn test() { | ||
data(1); | ||
data2(1); | ||
} | ||
} | ||
} | ||
|
||
mod indent4 { | ||
use column_____________________________________________________________________________________102:: | ||
bar::baz::Baz; | ||
use column_____________________________________________________________________________________102:: | ||
bar::{Bar, Bar2}; | ||
use column_____________________________________________________________________________________102::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use column_______________________________________________________________________________096:: | ||
bar::baz::Baz; | ||
use column_______________________________________________________________________________096:: | ||
bar::{Bar, Bar2}; | ||
use column_______________________________________________________________________________096::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use column_________________________________________________________________________090::bar:: | ||
baz::Baz; | ||
use column_________________________________________________________________________090::bar::{ | ||
Bar, Bar2, | ||
}; | ||
use column_________________________________________________________________________090::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c102::bar::baz::Baz; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c102::bar::{Bar, Bar2}; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c102::{Foo, Foo2}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
bar::baz::Baz; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
bar::{Bar, Bar2}; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::bar:: | ||
baz::Baz; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::bar::{ | ||
Bar, Bar2, | ||
}; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::bar::baz::Baz; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::bar::{ | ||
Bar, Bar2, | ||
}; | ||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{Foo, Foo2}; | ||
|
||
// 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:: | ||
bar::baz::Baz; | ||
use x:: | ||
column______________________________________________________________________________098:: | ||
bar::{Bar, Bar2}; | ||
use x:: | ||
column______________________________________________________________________________098::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use x::column__Only_the_last_one_wraps_due_to_brace_______________________________________097:: | ||
bar::baz::Baz; | ||
use x::column__Only_the_last_one_wraps_due_to_brace_______________________________________097:: | ||
bar::{Bar, Bar2}; | ||
use x:: | ||
column__Only_the_last_one_wraps_due_to_brace_______________________________________097::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
use x::column_____________________________________________________________________________096:: | ||
bar::baz::Baz; | ||
use x::column_____________________________________________________________________________096:: | ||
bar::{Bar, Bar2}; | ||
use x:: | ||
column_____________________________________________________________________________096::{ | ||
Foo, Foo2, | ||
}; | ||
|
||
// Test for top-level `UseSegmentKind::List`. | ||
use { | ||
a, | ||
column_____________________________________________________________________________________102, | ||
}; | ||
} | ||
|
||
use smithay::backend::renderer::element::utils::select_dmabuf_feedback; | ||
use smithay::backend::renderer::element::{ | ||
RenderElementStates, default_primary_scanout_output_compare, | ||
}; | ||
use smithay::desktop::space::SpaceElement; | ||
use smithay::desktop::utils::{ | ||
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}; | ||
use smithay::input::pointer::{CursorImageStatus, PointerHandle}; | ||
use smithay::input::{Seat, SeatHandler, SeatState}; | ||
use smithay::output::Output; | ||
use smithay::reexports::calloop::generic::Generic; | ||
use smithay::reexports::calloop::{Interest, LoopHandle, Mode, PostAction}; | ||
use smithay::reexports::wayland_protocols::xdg::decoration::zv1::server:: | ||
zxdg_toplevel_decoration_v1::Mode as DecorationMode; | ||
use smithay::reexports::wayland_protocols::xdg::decoration::{self as xdg_decoration}; | ||
use smithay::reexports::wayland_server::backend::{ClientData, ClientId, DisconnectReason}; | ||
use smithay::reexports::wayland_server::protocol::wl_data_source::WlDataSource; | ||
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::{ | ||
CompositorClientState, CompositorState, get_parent, with_states, | ||
}; | ||
use smithay::wayland::dmabuf::DmabufFeedback; | ||
use smithay::wayland::fractional_scale::{ | ||
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::{ | ||
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, | ||
}; | ||
use smithay::wayland::pointer_gestures::PointerGesturesState; | ||
use smithay::wayland::presentation::PresentationState; | ||
use smithay::wayland::relative_pointer::RelativePointerManagerState; | ||
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::{ | ||
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, | ||
set_data_device_focus, | ||
}; | ||
use smithay::wayland::selection::primary_selection::{ | ||
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus, | ||
}; | ||
use smithay::wayland::selection::wlr_data_control::{DataControlHandler, DataControlState}; | ||
use smithay::wayland::shell::wlr_layer::WlrLayerShellState; | ||
use smithay::wayland::shell::xdg::decoration::{XdgDecorationHandler, XdgDecorationState}; | ||
use smithay::wayland::shell::xdg::{ToplevelSurface, XdgShellState, XdgToplevelSurfaceData}; | ||
use smithay::wayland::shm::{ShmHandler, ShmState}; | ||
use smithay::wayland::socket::ListeningSocketSource; | ||
use smithay::wayland::tablet_manager::{TabletManagerState, TabletSeatTrait}; | ||
use smithay::wayland::text_input::TextInputManagerState; | ||
use smithay::wayland::viewporter::ViewporterState; | ||
use smithay::wayland::virtual_keyboard::VirtualKeyboardManagerState; | ||
use smithay::wayland::xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}; | ||
use smithay::wayland::xdg_foreign::{XdgForeignHandler, XdgForeignState}; | ||
use smithay::{ | ||
delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale, | ||
delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
// rustfmt-imports_granularity: One | ||
// rustfmt-style_edition: 2024 | ||
|
||
pub use foo::{x, x as x2, y}; | ||
use { | ||
bar::{ | ||
a, | ||
b::{self, f, g}, | ||
c, | ||
d::{e, e as e2}, | ||
}, | ||
qux::{h, i}, | ||
}; | ||
|
||
mod indent4 { | ||
use column_____________________________________________________________________________________102::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use column_______________________________________________________________________________096::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use column_________________________________________________________________________090::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c102::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
|
||
use c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::{ | ||
Foo, Foo2, | ||
bar::{Bar, Bar2, baz::Baz}, | ||
}; | ||
} | ||
|
||
use smithay::{ | ||
backend::renderer::element::{ | ||
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, | ||
delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, | ||
delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat, | ||
delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager, | ||
delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, | ||
delegate_xdg_decoration, delegate_xdg_shell, | ||
desktop::{ | ||
PopupKind, PopupManager, Space, | ||
space::SpaceElement, | ||
utils::{ | ||
OutputPresentationFeedback, surface_presentation_feedback_flags_from_states, | ||
surface_primary_scanout_output, update_surface_primary_scanout_output, | ||
}, | ||
}, | ||
input::{ | ||
Seat, SeatHandler, SeatState, | ||
keyboard::{Keysym, LedState, XkbConfig}, | ||
pointer::{CursorImageStatus, PointerHandle}, | ||
}, | ||
output::Output, | ||
reexports::{ | ||
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}, | ||
}, | ||
}, | ||
utils::{Clock, Monotonic, Rectangle}, | ||
wayland::{ | ||
compositor::{CompositorClientState, CompositorState, get_parent, with_states}, | ||
dmabuf::DmabufFeedback, | ||
fractional_scale::{ | ||
FractionalScaleHandler, FractionalScaleManagerState, with_fractional_scale, | ||
}, | ||
input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface}, | ||
keyboard_shortcuts_inhibit::{ | ||
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, | ||
KeyboardShortcutsInhibitor, | ||
}, | ||
output::{OutputHandler, OutputManagerState}, | ||
pointer_constraints::{ | ||
PointerConstraintsHandler, PointerConstraintsState, with_pointer_constraint, | ||
}, | ||
pointer_gestures::PointerGesturesState, | ||
presentation::PresentationState, | ||
relative_pointer::RelativePointerManagerState, | ||
seat::WaylandFocus, | ||
security_context::{ | ||
SecurityContext, SecurityContextHandler, SecurityContextListenerSource, | ||
SecurityContextState, | ||
}, | ||
selection::{ | ||
SelectionHandler, | ||
data_device::{ | ||
ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler, | ||
set_data_device_focus, | ||
}, | ||
primary_selection::{ | ||
PrimarySelectionHandler, PrimarySelectionState, set_primary_focus, | ||
}, | ||
wlr_data_control::{DataControlHandler, DataControlState}, | ||
}, | ||
shell::{ | ||
wlr_layer::WlrLayerShellState, | ||
xdg::{ | ||
ToplevelSurface, XdgShellState, XdgToplevelSurfaceData, | ||
decoration::{XdgDecorationHandler, XdgDecorationState}, | ||
}, | ||
}, | ||
shm::{ShmHandler, ShmState}, | ||
socket::ListeningSocketSource, | ||
tablet_manager::{TabletManagerState, TabletSeatTrait}, | ||
text_input::TextInputManagerState, | ||
viewporter::ViewporterState, | ||
virtual_keyboard::VirtualKeyboardManagerState, | ||
xdg_activation::{ | ||
XdgActivationHandler, XdgActivationState, XdgActivationToken, XdgActivationTokenData, | ||
}, | ||
xdg_foreign::{XdgForeignHandler, XdgForeignState}, | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,13 @@ | ||
use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerBinding:: | ||
BluetoothRemoteGATTServerMethods; | ||
|
||
mod indent4 { | ||
use column__This_segment_overflows_because_it_follows_use______________________________________102:: | ||
column__This_segment_overflows_because_it_follows_newline__________________________________102:: | ||
c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c012:: | ||
column__This_segment_wraps_because_it_exceeds_100_and_follows_the_previous_segment___102:: | ||
c012::c018::c024::c030::c036::c042::c048::c054::c060::c066::c072::c078::c084::c090::c096:: | ||
c012::column__This_segment_doesnt_wrap_because_it_doesnt_exceed_100__________________096:: | ||
Foo; | ||
} |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
imho: It would be helpful to add a comment explaining why
reserved_room_for_brace
is calculated?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added. Thanks!