From 3338909170a88277493e978102314666ead700ac Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Fri, 21 Feb 2025 10:44:29 +0100 Subject: [PATCH] all: set rust edition to 2024 --- Cargo.toml | 2 +- algorithms/Cargo.toml | 2 +- build/tokens.rs | 2 +- build/vulkan.rs | 2 +- build/wire.rs | 2 +- build/wire_dbus.rs | 6 +-- build/wire_ei.rs | 4 +- build/wire_xcon.rs | 14 ++++-- deploy-notes.md | 3 ++ jay-config/Cargo.toml | 2 +- jay-config/src/_private/client.rs | 22 ++++----- jay-config/src/_private/ipc.rs | 16 +++---- jay-config/src/input.rs | 6 +-- jay-config/src/io.rs | 4 +- jay-config/src/keyboard/mods.rs | 2 +- jay-config/src/macros.rs | 4 +- jay-config/src/status.rs | 4 +- jay-config/src/theme.rs | 5 +- jay-config/src/video.rs | 14 +++--- src/acceptor.rs | 4 +- src/allocator.rs | 2 +- src/backend.rs | 2 +- src/backends/metal.rs | 6 +-- src/backends/metal/monitor.rs | 4 +- src/backends/metal/present.rs | 14 +++--- src/backends/metal/video.rs | 46 +++++++++++-------- src/backends/x.rs | 10 ++-- src/cli.rs | 4 +- src/cli/damage_tracking.rs | 4 +- src/cli/idle.rs | 6 +-- src/cli/input.rs | 8 ++-- src/cli/log.rs | 2 +- src/cli/quit.rs | 2 +- src/cli/randr.rs | 4 +- src/cli/screenshot.rs | 2 +- src/cli/seat_test.rs | 4 +- src/cli/set_log_level.rs | 2 +- src/cli/unlock.rs | 2 +- src/cli/xwayland.rs | 4 +- src/client.rs | 6 +-- src/client/objects.rs | 4 +- src/client/tasks.rs | 2 +- src/clientmem.rs | 4 +- src/compositor.rs | 8 ++-- src/config.rs | 3 +- src/config/handler.rs | 23 +++++----- src/cpu_worker.rs | 2 +- src/cpu_worker/jobs/read_write.rs | 4 +- src/cpu_worker/tests.rs | 2 +- src/cursor.rs | 17 +++++-- src/cursor_user.rs | 2 +- src/dbus.rs | 4 +- src/dbus/auth.rs | 2 +- src/dbus/dynamic_type.rs | 2 +- src/dbus/formatter.rs | 2 +- src/dbus/holder.rs | 2 +- src/dbus/incoming.rs | 6 +-- src/dbus/parser.rs | 2 +- src/dbus/socket.rs | 14 +++--- src/drm_feedback.rs | 2 +- src/ei/ei_acceptor.rs | 2 +- src/ei/ei_client.rs | 4 +- src/ei/ei_client/ei_tasks.rs | 4 +- src/ei/ei_ifs/ei_button.rs | 2 +- src/ei/ei_ifs/ei_callback.rs | 2 +- src/ei/ei_ifs/ei_connection.rs | 10 ++-- src/ei/ei_ifs/ei_device.rs | 2 +- src/ei/ei_ifs/ei_handshake.rs | 6 +-- src/ei/ei_ifs/ei_keyboard.rs | 2 +- src/ei/ei_ifs/ei_pingpong.rs | 2 +- src/ei/ei_ifs/ei_pointer.rs | 2 +- src/ei/ei_ifs/ei_pointer_absolute.rs | 2 +- src/ei/ei_ifs/ei_scroll.rs | 2 +- src/ei/ei_ifs/ei_seat.rs | 8 ++-- src/ei/ei_ifs/ei_touchscreen.rs | 2 +- src/ei/ei_object.rs | 2 +- src/forker.rs | 4 +- src/forker/io.rs | 2 +- src/format.rs | 14 +++--- src/gfx_api.rs | 4 +- src/gfx_apis/gl.rs | 8 ++-- src/gfx_apis/gl/egl.rs | 10 ++-- src/gfx_apis/gl/egl/context.rs | 6 +-- src/gfx_apis/gl/egl/display.rs | 24 +++++----- src/gfx_apis/gl/egl/image.rs | 2 +- src/gfx_apis/gl/ext.rs | 4 +- src/gfx_apis/gl/gl/program.rs | 4 +- src/gfx_apis/gl/gl/render_buffer.rs | 6 +-- src/gfx_apis/gl/gl/shader.rs | 6 +-- src/gfx_apis/gl/gl/texture.rs | 8 ++-- src/gfx_apis/gl/renderer/context.rs | 6 +-- src/gfx_apis/gl/renderer/framebuffer.rs | 2 +- src/gfx_apis/gl/renderer/image.rs | 4 +- src/gfx_apis/gl/renderer/sync.rs | 6 +-- src/gfx_apis/gl/renderer/texture.rs | 6 +-- src/gfx_apis/vulkan.rs | 10 ++-- src/gfx_apis/vulkan/allocator.rs | 4 +- src/gfx_apis/vulkan/bo_allocator.rs | 16 +++---- src/gfx_apis/vulkan/command.rs | 2 +- src/gfx_apis/vulkan/descriptor.rs | 2 +- src/gfx_apis/vulkan/descriptor_buffer.rs | 2 +- src/gfx_apis/vulkan/device.rs | 27 +++++------ src/gfx_apis/vulkan/fence.rs | 2 +- src/gfx_apis/vulkan/format.rs | 6 +-- src/gfx_apis/vulkan/image.rs | 6 +-- src/gfx_apis/vulkan/instance.rs | 16 +++---- src/gfx_apis/vulkan/pipeline.rs | 4 +- src/gfx_apis/vulkan/renderer.rs | 25 +++++----- src/gfx_apis/vulkan/sampler.rs | 2 +- src/gfx_apis/vulkan/semaphore.rs | 2 +- src/gfx_apis/vulkan/shaders.rs | 2 +- src/gfx_apis/vulkan/shm_image.rs | 4 +- src/gfx_apis/vulkan/staging.rs | 4 +- src/gfx_apis/vulkan/transfer.rs | 4 +- src/globals.rs | 2 +- src/ifs/ext_foreign_toplevel_handle_v1.rs | 2 +- ...oplevel_image_capture_source_manager_v1.rs | 2 +- src/ifs/ext_foreign_toplevel_list_v1.rs | 6 +-- src/ifs/ext_idle_notification_v1.rs | 2 +- src/ifs/ext_idle_notifier_v1.rs | 4 +- src/ifs/ext_image_capture_source_v1.rs | 2 +- ...xt_image_copy_capture_cursor_session_v1.rs | 2 +- .../ext_image_copy_capture_frame_v1.rs | 4 +- .../ext_image_copy_capture_manager_v1.rs | 4 +- .../ext_image_copy_capture_session_v1.rs | 4 +- ..._output_image_capture_source_manager_v1.rs | 2 +- src/ifs/ext_session_lock_manager_v1.rs | 4 +- src/ifs/ext_session_lock_v1.rs | 2 +- .../ext_data_control_device_v1.rs | 6 +-- .../ext_data_control_manager_v1.rs | 12 ++--- .../data_control/ext_data_control_offer_v1.rs | 4 +- .../ext_data_control_source_v1.rs | 6 +-- src/ifs/ipc/data_control/private.rs | 9 ++-- .../zwlr_data_control_device_v1.rs | 6 +-- .../zwlr_data_control_manager_v1.rs | 12 ++--- .../zwlr_data_control_offer_v1.rs | 4 +- .../zwlr_data_control_source_v1.rs | 6 +-- src/ifs/ipc/wl_data_device.rs | 7 ++- src/ifs/ipc/wl_data_device_manager.rs | 2 +- src/ifs/ipc/wl_data_offer.rs | 8 ++-- src/ifs/ipc/wl_data_source.rs | 7 ++- src/ifs/ipc/x_data_device.rs | 6 +-- src/ifs/ipc/x_data_offer.rs | 5 +- src/ifs/ipc/x_data_source.rs | 4 +- ...zwp_primary_selection_device_manager_v1.rs | 2 +- .../ipc/zwp_primary_selection_device_v1.rs | 11 ++--- src/ifs/ipc/zwp_primary_selection_offer_v1.rs | 6 +-- .../ipc/zwp_primary_selection_source_v1.rs | 8 ++-- src/ifs/jay_compositor.rs | 4 +- src/ifs/jay_damage_tracking.rs | 4 +- src/ifs/jay_ei_session.rs | 2 +- src/ifs/jay_ei_session_builder.rs | 2 +- src/ifs/jay_idle.rs | 2 +- src/ifs/jay_input.rs | 2 +- src/ifs/jay_log_file.rs | 2 +- src/ifs/jay_output.rs | 2 +- src/ifs/jay_pointer.rs | 2 +- src/ifs/jay_randr.rs | 2 +- src/ifs/jay_render_ctx.rs | 2 +- src/ifs/jay_screencast.rs | 8 ++-- src/ifs/jay_screenshot.rs | 2 +- src/ifs/jay_seat_events.rs | 4 +- src/ifs/jay_select_toplevel.rs | 4 +- src/ifs/jay_select_workspace.rs | 2 +- src/ifs/jay_toplevel.rs | 2 +- src/ifs/jay_tray_v1.rs | 2 +- src/ifs/jay_workspace.rs | 2 +- src/ifs/jay_workspace_watcher.rs | 2 +- src/ifs/jay_xwayland.rs | 2 +- src/ifs/org_kde_kwin_server_decoration.rs | 2 +- .../org_kde_kwin_server_decoration_manager.rs | 2 +- src/ifs/wl_buffer.rs | 4 +- src/ifs/wl_callback.rs | 2 +- src/ifs/wl_compositor.rs | 2 +- src/ifs/wl_display.rs | 2 +- src/ifs/wl_drm.rs | 4 +- src/ifs/wl_fixes.rs | 2 +- src/ifs/wl_output.rs | 4 +- src/ifs/wl_output/removed_output.rs | 2 +- src/ifs/wl_region.rs | 2 +- src/ifs/wl_registry.rs | 2 +- src/ifs/wl_seat.rs | 17 ++++--- src/ifs/wl_seat/event_handling.rs | 18 ++++---- .../wl_seat/ext_transient_seat_manager_v1.rs | 4 +- src/ifs/wl_seat/ext_transient_seat_v1.rs | 2 +- src/ifs/wl_seat/pointer_owner.rs | 14 +++--- src/ifs/wl_seat/tablet.rs | 2 +- src/ifs/wl_seat/tablet/pad.rs | 4 +- src/ifs/wl_seat/tablet/tool.rs | 10 ++-- .../wl_seat/tablet/zwp_tablet_manager_v2.rs | 2 +- .../wl_seat/tablet/zwp_tablet_pad_group_v2.rs | 5 +- .../wl_seat/tablet/zwp_tablet_pad_ring_v2.rs | 4 +- .../wl_seat/tablet/zwp_tablet_pad_strip_v2.rs | 4 +- src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs | 6 +-- src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs | 9 ++-- src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs | 4 +- src/ifs/wl_seat/tablet/zwp_tablet_v2.rs | 4 +- src/ifs/wl_seat/text_input.rs | 2 +- .../zwp_input_method_keyboard_grab_v2.rs | 2 +- .../text_input/zwp_input_method_manager_v2.rs | 6 +-- .../wl_seat/text_input/zwp_input_method_v2.rs | 10 ++-- .../text_input/zwp_text_input_manager_v3.rs | 2 +- .../wl_seat/text_input/zwp_text_input_v3.rs | 10 ++-- src/ifs/wl_seat/wl_keyboard.rs | 2 +- src/ifs/wl_seat/wl_pointer.rs | 2 +- src/ifs/wl_seat/wl_touch.rs | 2 +- src/ifs/wl_seat/zwp_pointer_constraints_v1.rs | 6 +-- .../zwp_confined_pointer_v1.rs | 2 +- .../zwp_locked_pointer_v1.rs | 2 +- .../wl_seat/zwp_pointer_gesture_hold_v1.rs | 2 +- .../wl_seat/zwp_pointer_gesture_pinch_v1.rs | 2 +- .../wl_seat/zwp_pointer_gesture_swipe_v1.rs | 2 +- src/ifs/wl_seat/zwp_pointer_gestures_v1.rs | 2 +- .../zwp_relative_pointer_manager_v1.rs | 2 +- src/ifs/wl_seat/zwp_relative_pointer_v1.rs | 2 +- .../zwp_virtual_keyboard_manager_v1.rs | 4 +- src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs | 4 +- src/ifs/wl_shm.rs | 2 +- src/ifs/wl_shm_pool.rs | 2 +- src/ifs/wl_subcompositor.rs | 2 +- src/ifs/wl_surface.rs | 14 +++--- src/ifs/wl_surface/commit_timeline.rs | 4 +- .../wl_surface/ext_session_lock_surface_v1.rs | 6 ++- src/ifs/wl_surface/tray.rs | 2 +- src/ifs/wl_surface/tray/jay_tray_item_v1.rs | 10 ++-- src/ifs/wl_surface/wl_subsurface.rs | 2 +- .../wp_alpha_modifier_surface_v1.rs | 2 +- src/ifs/wl_surface/wp_commit_timer_v1.rs | 2 +- src/ifs/wl_surface/wp_fifo_v1.rs | 2 +- src/ifs/wl_surface/wp_fractional_scale_v1.rs | 2 +- .../wp_linux_drm_syncobj_surface_v1.rs | 2 +- src/ifs/wl_surface/wp_tearing_control_v1.rs | 2 +- src/ifs/wl_surface/wp_viewport.rs | 2 +- src/ifs/wl_surface/x_surface.rs | 2 +- .../x_surface/xwayland_surface_v1.rs | 4 +- src/ifs/wl_surface/x_surface/xwindow.rs | 10 ++-- src/ifs/wl_surface/xdg_surface.rs | 16 ++++--- src/ifs/wl_surface/xdg_surface/xdg_popup.rs | 8 ++-- .../wl_surface/xdg_surface/xdg_toplevel.rs | 18 ++++---- .../xdg_surface/xdg_toplevel/xdg_dialog_v1.rs | 2 +- src/ifs/wl_surface/xwayland_shell_v1.rs | 4 +- src/ifs/wl_surface/zwlr_layer_surface_v1.rs | 10 ++-- src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs | 2 +- .../wl_surface/zwp_input_popup_surface_v2.rs | 6 ++- .../ext_workspace_group_handle_v1.rs | 2 +- .../ext_workspace_handle_v1.rs | 2 +- .../ext_workspace_manager_v1.rs | 6 +-- src/ifs/wp_alpha_modifier_v1.rs | 2 +- src/ifs/wp_commit_timing_manager_v1.rs | 2 +- src/ifs/wp_content_type_manager_v1.rs | 2 +- src/ifs/wp_content_type_v1.rs | 2 +- src/ifs/wp_cursor_shape_device_v1.rs | 4 +- src/ifs/wp_cursor_shape_manager_v1.rs | 2 +- src/ifs/wp_drm_lease_connector_v1.rs | 2 +- src/ifs/wp_drm_lease_device_v1.rs | 6 +-- .../wp_drm_lease_device_v1/removed_device.rs | 2 +- src/ifs/wp_drm_lease_request_v1.rs | 2 +- src/ifs/wp_drm_lease_v1.rs | 2 +- src/ifs/wp_fifo_manager_v1.rs | 2 +- src/ifs/wp_fractional_scale_manager_v1.rs | 2 +- src/ifs/wp_linux_drm_syncobj_manager_v1.rs | 2 +- src/ifs/wp_linux_drm_syncobj_timeline_v1.rs | 2 +- src/ifs/wp_presentation.rs | 2 +- src/ifs/wp_presentation_feedback.rs | 2 +- src/ifs/wp_security_context_manager_v1.rs | 2 +- src/ifs/wp_security_context_v1.rs | 4 +- src/ifs/wp_single_pixel_buffer_manager_v1.rs | 2 +- src/ifs/wp_tearing_control_manager_v1.rs | 2 +- src/ifs/wp_viewporter.rs | 2 +- src/ifs/xdg_activation_token_v1.rs | 4 +- src/ifs/xdg_activation_v1.rs | 2 +- src/ifs/xdg_positioner.rs | 2 +- src/ifs/xdg_toplevel_drag_manager_v1.rs | 2 +- src/ifs/xdg_toplevel_drag_v1.rs | 2 +- src/ifs/xdg_wm_base.rs | 2 +- src/ifs/xdg_wm_dialog_v1.rs | 2 +- src/ifs/zwlr_layer_shell_v1.rs | 4 +- src/ifs/zwlr_screencopy_frame_v1.rs | 2 +- src/ifs/zwlr_screencopy_manager_v1.rs | 6 +-- src/ifs/zwp_idle_inhibit_manager_v1.rs | 2 +- src/ifs/zwp_linux_buffer_params_v1.rs | 6 +-- src/ifs/zwp_linux_dmabuf_feedback_v1.rs | 4 +- src/ifs/zwp_linux_dmabuf_v1.rs | 2 +- src/ifs/zxdg_decoration_manager_v1.rs | 2 +- src/ifs/zxdg_output_manager_v1.rs | 2 +- src/ifs/zxdg_output_v1.rs | 4 +- src/ifs/zxdg_toplevel_decoration_v1.rs | 2 +- src/io_uring.rs | 12 ++--- src/io_uring/ops/accept.rs | 6 +-- src/io_uring/ops/async_cancel.rs | 2 +- src/io_uring/ops/connect.rs | 6 +-- src/io_uring/ops/poll.rs | 6 +-- src/io_uring/ops/poll_external.rs | 4 +- src/io_uring/ops/read_write.rs | 6 +-- src/io_uring/ops/read_write_no_cancel.rs | 6 +-- src/io_uring/ops/recvmsg.rs | 6 +-- src/io_uring/ops/sendmsg.rs | 6 +-- src/io_uring/ops/timeout.rs | 4 +- src/io_uring/ops/timeout_external.rs | 4 +- src/io_uring/ops/timeout_link.rs | 4 +- src/io_uring/sys.rs | 2 +- src/it.rs | 20 ++++---- src/it/test_backend.rs | 2 +- src/it/test_client.rs | 2 +- src/it/test_config.rs | 5 +- src/it/test_gfx_api.rs | 4 +- src/it/test_ifs/test_alpha_modifier.rs | 2 +- .../test_ifs/test_alpha_modifier_surface.rs | 2 +- src/it/test_ifs/test_buffer.rs | 2 +- src/it/test_ifs/test_callback.rs | 2 +- src/it/test_ifs/test_compositor.rs | 2 +- src/it/test_ifs/test_content_type.rs | 2 +- src/it/test_ifs/test_content_type_manager.rs | 2 +- src/it/test_ifs/test_cursor_shape_device.rs | 2 +- src/it/test_ifs/test_cursor_shape_manager.rs | 2 +- src/it/test_ifs/test_data_control_device.rs | 2 +- src/it/test_ifs/test_data_control_manager.rs | 2 +- src/it/test_ifs/test_data_control_offer.rs | 4 +- src/it/test_ifs/test_data_control_source.rs | 2 +- src/it/test_ifs/test_data_device.rs | 2 +- src/it/test_ifs/test_data_device_manager.rs | 2 +- src/it/test_ifs/test_data_offer.rs | 2 +- src/it/test_ifs/test_data_source.rs | 2 +- src/it/test_ifs/test_display.rs | 2 +- src/it/test_ifs/test_dmabuf.rs | 2 +- src/it/test_ifs/test_dmabuf_feedback.rs | 4 +- .../test_ext_foreign_toplevel_handle.rs | 2 +- .../test_ext_foreign_toplevel_list.rs | 2 +- src/it/test_ifs/test_input_method.rs | 2 +- .../test_input_method_keyboard_grab.rs | 2 +- src/it/test_ifs/test_input_method_manager.rs | 2 +- src/it/test_ifs/test_input_popup_surface.rs | 2 +- src/it/test_ifs/test_jay_compositor.rs | 2 +- src/it/test_ifs/test_keyboard.rs | 2 +- src/it/test_ifs/test_pointer.rs | 2 +- src/it/test_ifs/test_region.rs | 2 +- src/it/test_ifs/test_registry.rs | 2 +- src/it/test_ifs/test_screenshot.rs | 2 +- src/it/test_ifs/test_seat.rs | 2 +- src/it/test_ifs/test_shm.rs | 2 +- src/it/test_ifs/test_shm_pool.rs | 2 +- .../test_single_pixel_buffer_manager.rs | 2 +- src/it/test_ifs/test_subcompositor.rs | 2 +- src/it/test_ifs/test_subsurface.rs | 2 +- src/it/test_ifs/test_surface.rs | 2 +- src/it/test_ifs/test_syncobj_manager.rs | 2 +- src/it/test_ifs/test_syncobj_surface.rs | 2 +- src/it/test_ifs/test_syncobj_timeline.rs | 2 +- src/it/test_ifs/test_text_input.rs | 2 +- src/it/test_ifs/test_text_input_manager.rs | 2 +- src/it/test_ifs/test_toplevel_drag.rs | 2 +- src/it/test_ifs/test_toplevel_drag_manager.rs | 2 +- src/it/test_ifs/test_viewport.rs | 2 +- src/it/test_ifs/test_viewporter.rs | 2 +- src/it/test_ifs/test_virtual_keyboard.rs | 2 +- .../test_ifs/test_virtual_keyboard_manager.rs | 2 +- src/it/test_ifs/test_wl_fixes.rs | 2 +- src/it/test_ifs/test_xdg_activation.rs | 2 +- src/it/test_ifs/test_xdg_activation_token.rs | 2 +- src/it/test_ifs/test_xdg_base.rs | 2 +- src/it/test_ifs/test_xdg_surface.rs | 2 +- src/it/test_ifs/test_xdg_toplevel.rs | 2 +- src/it/test_mem.rs | 2 +- src/it/tests/t0011_set_keymap.rs | 9 ++-- src/it/tests/t0031_syncobj.rs | 6 ++- src/it/tests/t0042_toplevel_select.rs | 2 +- src/kbvm.rs | 5 +- src/keyboard.rs | 2 +- src/libinput.rs | 6 +-- src/libinput/device.rs | 8 +--- src/libinput/sys.rs | 2 +- src/logger.rs | 4 +- src/logind.rs | 4 +- src/output_schedule.rs | 2 +- src/pango.rs | 2 +- src/pipewire/pw_con.rs | 12 ++--- src/pipewire/pw_ifs/pw_client_node.rs | 36 +++++++-------- src/pipewire/pw_ifs/pw_core.rs | 4 +- src/pipewire/pw_mem.rs | 4 +- src/pipewire/pw_pod.rs | 2 +- src/portal.rs | 10 ++-- src/portal/ptl_display.rs | 14 +++--- src/portal/ptl_remote_desktop.rs | 4 +- .../ptl_remote_desktop/remote_desktop_gui.rs | 2 +- src/portal/ptl_screencast.rs | 14 +++--- src/portal/ptl_screencast/screencast_gui.rs | 2 +- src/portal/ptl_session.rs | 4 +- src/portal/ptl_text.rs | 2 +- src/portal/ptr_gui.rs | 8 ++-- src/rect/region.rs | 2 +- src/renderer.rs | 6 +-- src/renderer/renderer_base.rs | 8 ++-- src/screenshoter.rs | 4 +- src/security_context_acceptor.rs | 2 +- src/sighand.rs | 2 +- src/state.rs | 16 +++---- src/tasks/connector.rs | 2 +- src/tasks/hardware_cursor.rs | 2 +- src/tasks/idle.rs | 2 +- src/tasks/input_device.rs | 2 +- src/text.rs | 4 +- src/tools/tool_client.rs | 4 +- src/tracy.rs | 2 +- src/tracy/tracy_impl.rs | 2 +- src/tree.rs | 4 +- src/tree/container.rs | 10 ++-- src/tree/display.rs | 7 ++- src/tree/float.rs | 6 +-- src/tree/output.rs | 11 ++--- src/tree/placeholder.rs | 6 +-- src/tree/toplevel.rs | 16 +++++-- src/tree/walker.rs | 2 +- src/tree/workspace.rs | 10 ++-- src/udev.rs | 4 +- src/udmabuf.rs | 10 ++-- src/user_session.rs | 2 +- src/utils/activation_token.rs | 2 +- src/utils/buffd/buf_in.rs | 2 +- src/utils/buffd/buf_out.rs | 6 +-- src/utils/buffd/ei_formatter.rs | 2 +- src/utils/buffd/formatter.rs | 2 +- src/utils/bufio.rs | 2 +- src/utils/clone3.rs | 2 +- src/utils/fdcloser.rs | 4 +- src/utils/num_cpus.rs | 4 +- src/utils/opaque.rs | 4 +- src/utils/oserror.rs | 5 +- src/utils/pid_info.rs | 2 +- src/utils/process_name.rs | 2 +- src/utils/scroller.rs | 8 +--- src/utils/threshold_counter.rs | 6 +-- src/utils/timer.rs | 2 +- src/utils/toplevel_identifier.rs | 2 +- src/utils/transform_ext.rs | 4 +- src/video/dmabuf.rs | 2 +- src/video/drm.rs | 32 ++++++------- src/video/drm/sync_obj.rs | 10 ++-- src/video/drm/sys.rs | 2 +- src/video/drm/wait_for_sync_obj.rs | 4 +- src/video/gbm.rs | 11 +++-- src/wheel.rs | 2 +- src/wl_usr.rs | 2 +- src/wl_usr/usr_ifs/usr_jay_compositor.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_ei_session.rs | 4 +- .../usr_ifs/usr_jay_ei_session_builder.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_output.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_pointer.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_render_ctx.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_screencast.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs | 4 +- .../usr_ifs/usr_jay_select_workspace.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_toplevel.rs | 4 +- src/wl_usr/usr_ifs/usr_jay_workspace.rs | 4 +- .../usr_ifs/usr_jay_workspace_watcher.rs | 4 +- src/wl_usr/usr_ifs/usr_linux_buffer_params.rs | 4 +- src/wl_usr/usr_ifs/usr_linux_dmabuf.rs | 6 +-- src/wl_usr/usr_ifs/usr_wl_buffer.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_callback.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_compositor.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_display.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_output.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_pointer.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_registry.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_seat.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_shm.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_shm_pool.rs | 4 +- src/wl_usr/usr_ifs/usr_wl_surface.rs | 4 +- src/wl_usr/usr_ifs/usr_wlr_layer_shell.rs | 4 +- src/wl_usr/usr_ifs/usr_wlr_layer_surface.rs | 4 +- src/wl_usr/usr_ifs/usr_wp_fractional_scale.rs | 4 +- .../usr_wp_fractional_scale_manager.rs | 4 +- src/wl_usr/usr_ifs/usr_wp_viewport.rs | 4 +- src/wl_usr/usr_ifs/usr_wp_viewporter.rs | 4 +- .../usr_ifs/usr_zwlr_screencopy_frame.rs | 4 +- .../usr_ifs/usr_zwlr_screencopy_manager.rs | 4 +- src/xcon.rs | 10 ++-- src/xcon/incoming.rs | 2 +- src/xcon/parser.rs | 2 +- src/xcon/wire_type.rs | 2 +- src/xwayland.rs | 4 +- src/xwayland/xsocket.rs | 2 +- src/xwayland/xwm.rs | 21 ++++----- toml-config/Cargo.toml | 2 +- toml-config/src/config.rs | 6 +-- toml-config/src/config/parsers/action.rs | 12 +++-- toml-config/src/config/parsers/config.rs | 8 ++-- toml-config/src/config/parsers/connector.rs | 4 +- .../src/config/parsers/connector_match.rs | 6 +-- toml-config/src/config/parsers/drm_device.rs | 4 +- .../src/config/parsers/drm_device_match.rs | 6 +-- toml-config/src/config/parsers/exec.rs | 6 +-- toml-config/src/config/parsers/idle.rs | 2 +- toml-config/src/config/parsers/input.rs | 6 +-- toml-config/src/config/parsers/input_match.rs | 6 +-- toml-config/src/config/parsers/keymap.rs | 10 ++-- toml-config/src/config/parsers/libei.rs | 6 +-- toml-config/src/config/parsers/mode.rs | 6 +-- .../src/config/parsers/modified_keysym.rs | 6 +-- toml-config/src/config/parsers/output.rs | 4 +- .../src/config/parsers/output_match.rs | 6 +-- toml-config/src/config/parsers/repeat_rate.rs | 6 +-- toml-config/src/config/parsers/shortcuts.rs | 6 +-- toml-config/src/config/parsers/status.rs | 6 +-- toml-config/src/config/parsers/tearing.rs | 6 +-- toml-config/src/config/parsers/theme.rs | 4 +- toml-config/src/config/parsers/ui_drag.rs | 4 +- toml-config/src/config/parsers/vrr.rs | 6 +-- toml-config/src/config/parsers/xwayland.rs | 6 +-- toml-config/src/lib.rs | 22 ++++----- toml-config/src/toml/tests.rs | 4 +- toml-config/src/toml/toml_parser.rs | 2 +- toml-spec/Cargo.toml | 2 +- toml-spec/src/json_schema.rs | 2 +- toml-spec/src/markdown.rs | 5 +- toml-spec/src/types.rs | 8 ++-- 515 files changed, 1225 insertions(+), 1187 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 764ba7ea..032996ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jay-compositor" version = "1.9.0" -edition = "2021" +edition = "2024" build = "build/build.rs" license = "GPL-3.0-only" description = "The Jay compositor" diff --git a/algorithms/Cargo.toml b/algorithms/Cargo.toml index 9b1d4521..ff406458 100644 --- a/algorithms/Cargo.toml +++ b/algorithms/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jay-algorithms" version = "0.3.0" -edition = "2021" +edition = "2024" license = "GPL-3.0-only" description = "Internal dependency of the Jay compositor" repository = "https://github.com/mahkoh/jay" diff --git a/build/tokens.rs b/build/tokens.rs index be3bcde2..12238a33 100644 --- a/build/tokens.rs +++ b/build/tokens.rs @@ -1,5 +1,5 @@ use { - anyhow::{bail, Context, Result}, + anyhow::{Context, Result, bail}, bstr::{BString, ByteSlice}, }; diff --git a/build/vulkan.rs b/build/vulkan.rs index 37f2d7c9..52c306bb 100644 --- a/build/vulkan.rs +++ b/build/vulkan.rs @@ -1,6 +1,6 @@ use { crate::open, - anyhow::{anyhow, bail, Context}, + anyhow::{Context, anyhow, bail}, shaderc::{CompileOptions, ResolvedInclude}, std::{io::Write, path::Path}, }; diff --git a/build/wire.rs b/build/wire.rs index a21f8895..71b267cc 100644 --- a/build/wire.rs +++ b/build/wire.rs @@ -1,6 +1,6 @@ use { crate::open, - anyhow::{bail, Context, Result}, + anyhow::{Context, Result, bail}, std::{fs::DirEntry, io::Write, os::unix::ffi::OsStrExt}, }; diff --git a/build/wire_dbus.rs b/build/wire_dbus.rs index 5a1de8bf..2abedc51 100644 --- a/build/wire_dbus.rs +++ b/build/wire_dbus.rs @@ -1,12 +1,12 @@ use { crate::{ open, - tokens::{tokenize, Lined, Symbol, Token, TokenKind, TreeDelim}, + tokens::{Lined, Symbol, Token, TokenKind, TreeDelim, tokenize}, }, - anyhow::{bail, Context, Result}, + anyhow::{Context, Result, bail}, bstr::{BStr, BString, ByteSlice}, std::{ - collections::{hash_map::Entry, HashMap}, + collections::{HashMap, hash_map::Entry}, io::Write, os::unix::ffi::OsStrExt, }, diff --git a/build/wire_ei.rs b/build/wire_ei.rs index 388d214b..1153333d 100644 --- a/build/wire_ei.rs +++ b/build/wire_ei.rs @@ -1,9 +1,9 @@ use { crate::{ open, - tokens::{tokenize, Symbol, Token, TokenKind, TreeDelim}, + tokens::{Symbol, Token, TokenKind, TreeDelim, tokenize}, }, - anyhow::{bail, Context, Result}, + anyhow::{Context, Result, bail}, std::{fs::DirEntry, io::Write, os::unix::ffi::OsStrExt}, }; diff --git a/build/wire_xcon.rs b/build/wire_xcon.rs index 58a2c71c..6eb3566a 100644 --- a/build/wire_xcon.rs +++ b/build/wire_xcon.rs @@ -1,9 +1,9 @@ use { crate::{ open, - tokens::{tokenize, Symbol, Token, TokenKind, TreeDelim}, + tokens::{Symbol, Token, TokenKind, TreeDelim, tokenize}, }, - anyhow::{bail, Context, Result}, + anyhow::{Context, Result, bail}, bstr::ByteSlice, std::{cell::Cell, collections::HashMap, io::Write, mem, os::unix::ffi::OsStrExt, rc::Rc}, }; @@ -1171,7 +1171,10 @@ fn format_enum(f: &mut F, s: &Enum, protocols: &Protocols) -> Result<( writeln!(f, " }}")?; writeln!(f, " }}")?; writeln!(f)?; - writeln!(f, " pub fn deserialize(parser: &mut Parser{lt_a}, value: u32) -> Result {{")?; + writeln!( + f, + " pub fn deserialize(parser: &mut Parser{lt_a}, value: u32) -> Result {{" + )?; writeln!(f, " let res = match value {{")?; for field in &s.variants { writeln!( @@ -1233,7 +1236,10 @@ fn format_bitmask(f: &mut F, s: &Bitmask, protocols: &Protocols) -> Re writeln!(f, " formatter.write_bytes(&bytes[..pos]);")?; writeln!(f, " }}")?; writeln!(f)?; - writeln!(f, " pub fn deserialize(&self, parser: &mut Parser, bitmask: u32) -> Result {{")?; + writeln!( + f, + " pub fn deserialize(&self, parser: &mut Parser, bitmask: u32) -> Result {{" + )?; writeln!( f, " let b = parser.read_slice(bitmask.count_ones() as usize * 4)?;" diff --git a/deploy-notes.md b/deploy-notes.md index d382a7c4..276af93a 100644 --- a/deploy-notes.md +++ b/deploy-notes.md @@ -1,5 +1,8 @@ # Unreleased +- Needs jay-algorithms release. +- Needs jay-config release. +- Needs jay-toml-config release. - Needs jay-compositor release. # 1.9.0 diff --git a/jay-config/Cargo.toml b/jay-config/Cargo.toml index b2653c6e..8c8dd4a2 100644 --- a/jay-config/Cargo.toml +++ b/jay-config/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jay-config" version = "1.7.0" -edition = "2021" +edition = "2024" license = "GPL-3.0-only" description = "Configuration crate for the Jay compositor" repository = "https://github.com/mahkoh/jay" diff --git a/jay-config/src/_private/client.rs b/jay-config/src/_private/client.rs index de2f8940..f4f263f4 100644 --- a/jay-config/src/_private/client.rs +++ b/jay-config/src/_private/client.rs @@ -3,50 +3,50 @@ use { crate::{ _private::{ - bincode_ops, + Config, ConfigEntry, ConfigEntryGen, PollableId, VERSION, WireMode, bincode_ops, ipc::{ ClientMessage, InitMessage, Response, ServerFeature, ServerMessage, WorkspaceSource, }, - logging, Config, ConfigEntry, ConfigEntryGen, PollableId, WireMode, VERSION, + logging, }, + Axis, Direction, ModifiedKeySym, PciId, Workspace, exec::Command, input::{ - acceleration::AccelProfile, capability::Capability, FocusFollowsMouseMode, InputDevice, - Seat, SwitchEvent, + FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, acceleration::AccelProfile, + capability::Capability, }, keyboard::{ + Keymap, mods::{Modifiers, RELEASE}, syms::KeySym, - Keymap, }, logging::LogLevel, tasks::{JoinHandle, JoinSlot}, - theme::{colors::Colorable, sized::Resizable, Color}, + theme::{Color, colors::Colorable, sized::Resizable}, timer::Timer, video::{ - connector_type::{ConnectorType, CON_UNKNOWN}, Connector, DrmDevice, Format, GfxApi, Mode, TearingMode, Transform, VrrMode, + connector_type::{CON_UNKNOWN, ConnectorType}, }, xwayland::XScalingMode, - Axis, Direction, ModifiedKeySym, PciId, Workspace, }, bincode::Options, futures_util::task::ArcWake, std::{ cell::{Cell, RefCell}, - collections::{hash_map::Entry, HashMap, VecDeque}, + collections::{HashMap, VecDeque, hash_map::Entry}, future::Future, mem, ops::Deref, os::fd::IntoRawFd, - panic::{catch_unwind, AssertUnwindSafe}, + panic::{AssertUnwindSafe, catch_unwind}, pin::Pin, ptr, rc::Rc, slice, sync::{ - atomic::{AtomicBool, Ordering::Relaxed}, Arc, Mutex, + atomic::{AtomicBool, Ordering::Relaxed}, }, task::{Context, Poll, Waker}, time::Duration, diff --git a/jay-config/src/_private/ipc.rs b/jay-config/src/_private/ipc.rs index 03d9f261..a68b05ec 100644 --- a/jay-config/src/_private/ipc.rs +++ b/jay-config/src/_private/ipc.rs @@ -1,19 +1,19 @@ use { crate::{ + _private::{PollableId, WireMode}, + Axis, Direction, PciId, Workspace, input::{ - acceleration::AccelProfile, capability::Capability, FocusFollowsMouseMode, InputDevice, - Seat, SwitchEvent, + FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, acceleration::AccelProfile, + capability::Capability, }, - keyboard::{mods::Modifiers, syms::KeySym, Keymap}, + keyboard::{Keymap, mods::Modifiers, syms::KeySym}, logging::LogLevel, - theme::{colors::Colorable, sized::Resizable, Color}, + theme::{Color, colors::Colorable, sized::Resizable}, timer::Timer, video::{ - connector_type::ConnectorType, Connector, DrmDevice, Format, GfxApi, TearingMode, - Transform, VrrMode, + Connector, DrmDevice, Format, GfxApi, TearingMode, Transform, VrrMode, + connector_type::ConnectorType, }, - Axis, Direction, PciId, Workspace, - _private::{PollableId, WireMode}, xwayland::XScalingMode, }, serde::{Deserialize, Serialize}, diff --git a/jay-config/src/input.rs b/jay-config/src/input.rs index 702ca31f..73d31131 100644 --- a/jay-config/src/input.rs +++ b/jay-config/src/input.rs @@ -5,10 +5,10 @@ pub mod capability; use { crate::{ - input::{acceleration::AccelProfile, capability::Capability}, - keyboard::{mods::Modifiers, Keymap}, + _private::{DEFAULT_SEAT_NAME, ipc::WorkspaceSource}, Axis, Direction, ModifiedKeySym, Workspace, - _private::{ipc::WorkspaceSource, DEFAULT_SEAT_NAME}, + input::{acceleration::AccelProfile, capability::Capability}, + keyboard::{Keymap, mods::Modifiers}, video::Connector, }, serde::{Deserialize, Serialize}, diff --git a/jay-config/src/io.rs b/jay-config/src/io.rs index ff116e89..175d59b4 100644 --- a/jay-config/src/io.rs +++ b/jay-config/src/io.rs @@ -2,13 +2,13 @@ use { crate::_private::PollableId, - futures_util::{io::AsyncRead, AsyncWrite}, + futures_util::{AsyncWrite, io::AsyncRead}, std::{ future::poll_fn, io::{self, ErrorKind, IoSlice, IoSliceMut, Read, Write}, os::fd::{AsFd, AsRawFd}, pin::Pin, - task::{ready, Context, Poll}, + task::{Context, Poll, ready}, }, thiserror::Error, uapi::c, diff --git a/jay-config/src/keyboard/mods.rs b/jay-config/src/keyboard/mods.rs index bd4a2329..5e98da84 100644 --- a/jay-config/src/keyboard/mods.rs +++ b/jay-config/src/keyboard/mods.rs @@ -1,7 +1,7 @@ //! Keyboard modifiers use { - crate::{keyboard::syms::KeySym, ModifiedKeySym}, + crate::{ModifiedKeySym, keyboard::syms::KeySym}, serde::{Deserialize, Serialize}, std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign}, }; diff --git a/jay-config/src/macros.rs b/jay-config/src/macros.rs index 698e0429..012d8d79 100644 --- a/jay-config/src/macros.rs +++ b/jay-config/src/macros.rs @@ -30,9 +30,7 @@ macro_rules! try_get { } macro_rules! get { - () => {{ - get!(Default::default()) - }}; + () => {{ get!(Default::default()) }}; ($def:expr) => {{ let client = unsafe { let client = crate::_private::client::CLIENT.with(|client| client.get()); diff --git a/jay-config/src/status.rs b/jay-config/src/status.rs index c92fa16a..2cae8f49 100644 --- a/jay-config/src/status.rs +++ b/jay-config/src/status.rs @@ -4,10 +4,10 @@ use { crate::{exec::Command, io::Async, tasks::spawn}, bstr::ByteSlice, error_reporter::Report, - futures_util::{io::BufReader, AsyncBufReadExt}, + futures_util::{AsyncBufReadExt, io::BufReader}, serde::Deserialize, std::borrow::BorrowMut, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; /// Sets the status text. diff --git a/jay-config/src/theme.rs b/jay-config/src/theme.rs index 38e3a19e..35f1757e 100644 --- a/jay-config/src/theme.rs +++ b/jay-config/src/theme.rs @@ -75,7 +75,10 @@ impl Color { if !validate_f32_all([r, g, b, a]) { Self::BLACK } else if r > a || g > a || b > a { - log::warn!("f32 values {:?} are not valid valid for a premultiplied color. Using solid black instead.", [r, g, b, a]); + log::warn!( + "f32 values {:?} are not valid valid for a premultiplied color. Using solid black instead.", + [r, g, b, a] + ); Self::BLACK } else { Self { r, g, b, a } diff --git a/jay-config/src/video.rs b/jay-config/src/video.rs index db70af0e..3aba3d1e 100644 --- a/jay-config/src/video.rs +++ b/jay-config/src/video.rs @@ -2,14 +2,14 @@ use { crate::{ - video::connector_type::{ - ConnectorType, CON_9PIN_DIN, CON_COMPONENT, CON_COMPOSITE, CON_DISPLAY_PORT, CON_DPI, - CON_DSI, CON_DVIA, CON_DVID, CON_DVII, CON_EDP, CON_EMBEDDED_WINDOW, CON_HDMIA, - CON_HDMIB, CON_LVDS, CON_SPI, CON_SVIDEO, CON_TV, CON_UNKNOWN, CON_USB, CON_VGA, - CON_VIRTUAL, CON_WRITEBACK, - }, - PciId, _private::WireMode, + PciId, + video::connector_type::{ + CON_9PIN_DIN, CON_COMPONENT, CON_COMPOSITE, CON_DISPLAY_PORT, CON_DPI, CON_DSI, + CON_DVIA, CON_DVID, CON_DVII, CON_EDP, CON_EMBEDDED_WINDOW, CON_HDMIA, CON_HDMIB, + CON_LVDS, CON_SPI, CON_SVIDEO, CON_TV, CON_UNKNOWN, CON_USB, CON_VGA, CON_VIRTUAL, + CON_WRITEBACK, ConnectorType, + }, }, serde::{Deserialize, Serialize}, std::{str::FromStr, time::Duration}, diff --git a/src/acceptor.rs b/src/acceptor.rs index 9959f74d..e2c2cc70 100644 --- a/src/acceptor.rs +++ b/src/acceptor.rs @@ -1,13 +1,13 @@ use { crate::{ async_engine::SpawnedFuture, - client::{ClientCaps, CAPS_DEFAULT}, + client::{CAPS_DEFAULT, ClientCaps}, state::State, utils::{errorfmt::ErrorFmt, oserror::OsError, xrd::xrd}, }, std::rc::Rc, thiserror::Error, - uapi::{c, format_ustr, Errno, OwnedFd, Ustr, Ustring}, + uapi::{Errno, OwnedFd, Ustr, Ustring, c, format_ustr}, }; #[derive(Debug, Error)] diff --git a/src/allocator.rs b/src/allocator.rs index f836a471..7d05df49 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -2,9 +2,9 @@ use { crate::{ format::Format, video::{ + Modifier, dmabuf::{DmaBuf, DmaBufIds}, drm::Drm, - Modifier, }, }, std::{error::Error, rc::Rc}, diff --git a/src/backend.rs b/src/backend.rs index 3438eb1a..ea1240d1 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -26,7 +26,7 @@ use { fmt::{Debug, Display, Formatter}, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; linear_ids!(ConnectorIds, ConnectorId); diff --git a/src/backends/metal.rs b/src/backends/metal.rs index 23ed3466..ac5a0fd6 100644 --- a/src/backends/metal.rs +++ b/src/backends/metal.rs @@ -24,13 +24,13 @@ use { }, }, libinput::{ + LibInput, LibInputAdapter, LibInputError, consts::{ AccelProfile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT, LIBINPUT_DEVICE_CAP_TABLET_PAD, LIBINPUT_DEVICE_CAP_TABLET_TOOL, }, device::{LibInputDevice, RegisteredDevice}, - LibInput, LibInputAdapter, LibInputError, }, logind::{LogindError, Session}, state::State, @@ -46,7 +46,7 @@ use { syncqueue::SyncQueue, }, video::{ - drm::{DrmError, DRM_MODE_ATOMIC_ALLOW_MODESET}, + drm::{DRM_MODE_ATOMIC_ALLOW_MODESET, DrmError}, gbm::GbmError, }, }, @@ -61,7 +61,7 @@ use { rc::Rc, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/backends/metal/monitor.rs b/src/backends/metal/monitor.rs index a9c3504e..21b3e4a4 100644 --- a/src/backends/metal/monitor.rs +++ b/src/backends/metal/monitor.rs @@ -2,8 +2,8 @@ use { crate::{ backend::{BackendEvent, ConnectorEvent}, backends::metal::{ - video::{FrontState, MetalDrmDeviceData, PendingDrmDevice}, MetalBackend, MetalDevice, MetalError, MetalInputDevice, + video::{FrontState, MetalDrmDeviceData, PendingDrmDevice}, }, dbus::{DbusError, TRUE}, udev::UdevDevice, @@ -20,7 +20,7 @@ use { }, bstr::ByteSlice, std::{cell::Cell, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; const DRM: &[u8] = b"drm"; diff --git a/src/backends/metal/present.rs b/src/backends/metal/present.rs index 25d9f3dc..d8bddce2 100644 --- a/src/backends/metal/present.rs +++ b/src/backends/metal/present.rs @@ -2,14 +2,14 @@ use { crate::{ backend::Connector, backends::metal::{ + MetalError, video::{ MetalConnector, MetalCrtc, MetalHardwareCursorChange, MetalPlane, RenderBuffer, }, - MetalError, }, gfx_api::{ - create_render_pass, AcquireSync, BufferResv, GfxApiOpt, GfxRenderPass, GfxTexture, - ReleaseSync, SyncFile, + AcquireSync, BufferResv, GfxApiOpt, GfxRenderPass, GfxTexture, ReleaseSync, SyncFile, + create_render_pass, }, rect::Region, theme::Color, @@ -20,8 +20,8 @@ use { video::{ dmabuf::DmaBufId, drm::{ - DrmError, DrmFramebuffer, DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_ASYNC, - DRM_MODE_PAGE_FLIP_EVENT, + DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_ASYNC, DRM_MODE_PAGE_FLIP_EVENT, + DrmError, DrmFramebuffer, }, }, }, @@ -248,7 +248,9 @@ impl MetalConnector { if let Err(e) = res { reset_damage(); if let MetalError::Commit(DrmError::Atomic(OsError(c::EACCES))) = e { - log::debug!("Could not perform atomic commit, likely because we're no longer the DRM master"); + log::debug!( + "Could not perform atomic commit, likely because we're no longer the DRM master" + ); return Ok(()); } Err(e) diff --git a/src/backends/metal/video.rs b/src/backends/metal/video.rs index a2069903..a071a83a 100644 --- a/src/backends/metal/video.rs +++ b/src/backends/metal/video.rs @@ -8,18 +8,18 @@ use { HardwareCursorUpdate, Mode, MonitorInfo, }, backends::metal::{ - present::{ - DirectScanoutCache, PresentFb, DEFAULT_POST_COMMIT_MARGIN, - DEFAULT_PRE_COMMIT_MARGIN, POST_COMMIT_MARGIN_DELTA, - }, MetalBackend, MetalError, + present::{ + DEFAULT_POST_COMMIT_MARGIN, DEFAULT_PRE_COMMIT_MARGIN, DirectScanoutCache, + POST_COMMIT_MARGIN_DELTA, PresentFb, + }, }, drm_feedback::DrmFeedback, edid::{CtaDataBlock, Descriptor, EdidExtension}, - format::{Format, ARGB8888, XRGB8888}, + format::{ARGB8888, Format, XRGB8888}, gfx_api::{ - needs_render_usage, AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync, - SyncFile, + AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync, SyncFile, + needs_render_usage, }, ifs::{ wl_output::OutputId, @@ -35,22 +35,22 @@ use { numcell::NumCell, on_change::OnChange, opaque_cell::OpaqueCell, oserror::OsError, }, video::{ + INVALID_MODIFIER, Modifier, dmabuf::DmaBufId, drm::{ - drm_mode_modeinfo, Change, ConnectorStatus, ConnectorType, DrmBlob, DrmConnector, - DrmCrtc, DrmEncoder, DrmError, DrmEvent, DrmFramebuffer, DrmLease, DrmMaster, - DrmModeInfo, DrmObject, DrmPlane, DrmProperty, DrmPropertyDefinition, - DrmPropertyType, DrmVersion, PropBlob, DRM_CLIENT_CAP_ATOMIC, - DRM_MODE_ATOMIC_ALLOW_MODESET, + Change, ConnectorStatus, ConnectorType, DRM_CLIENT_CAP_ATOMIC, + DRM_MODE_ATOMIC_ALLOW_MODESET, DrmBlob, DrmConnector, DrmCrtc, DrmEncoder, + DrmError, DrmEvent, DrmFramebuffer, DrmLease, DrmMaster, DrmModeInfo, DrmObject, + DrmPlane, DrmProperty, DrmPropertyDefinition, DrmPropertyType, DrmVersion, + PropBlob, drm_mode_modeinfo, }, - gbm::{GbmBo, GbmDevice, GBM_BO_USE_LINEAR, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT}, - Modifier, INVALID_MODIFIER, + gbm::{GBM_BO_USE_LINEAR, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT, GbmBo, GbmDevice}, }, }, ahash::{AHashMap, AHashSet}, arrayvec::ArrayVec, bstr::{BString, ByteSlice}, - indexmap::{indexset, IndexMap, IndexSet}, + indexmap::{IndexMap, IndexSet, indexset}, isnt::std_1::collections::IsntHashMap2Ext, jay_config::video::GfxApi, std::{ @@ -64,8 +64,8 @@ use { rc::Rc, }, uapi::{ - c::{self, dev_t}, OwnedFd, + c::{self, dev_t}, }, }; @@ -213,7 +213,9 @@ impl BackendDrmDevice for MetalDrmDevice { } } _ => { - log::error!("Connector is logically available for leasing, has a lease ID, and has no entry in leases_to_break"); + log::error!( + "Connector is logically available for leasing, has a lease ID, and has no entry in leases_to_break" + ); } } } @@ -1477,7 +1479,7 @@ fn create_plane(plane: DrmPlane, master: &Rc) -> Result { return Err(DrmError::MissingProperty( "type".to_string().into_boxed_str(), - )) + )); } }; let default_properties = create_default_properties( @@ -2292,14 +2294,18 @@ impl MetalBackend { } if let Some(plane) = c.primary_plane.get() { if plane.crtc_id.value.get() != crtc.id { - log::warn!("Cannot preserve connector whose primary plane is attached to a different crtc"); + log::warn!( + "Cannot preserve connector whose primary plane is attached to a different crtc" + ); fail!(c.id); } } if let Some(plane) = c.cursor_plane.get() { let crtc_id = plane.crtc_id.value.get(); if crtc_id.is_some() && crtc_id != crtc.id { - log::warn!("Cannot preserve connector whose cursor plane is attached to a different crtc"); + log::warn!( + "Cannot preserve connector whose cursor plane is attached to a different crtc" + ); fail!(c.id); } } diff --git a/src/backends/x.rs b/src/backends/x.rs index 0a230284..48ae4284 100644 --- a/src/backends/x.rs +++ b/src/backends/x.rs @@ -3,10 +3,10 @@ use { allocator::BufferObject, async_engine::{Phase, SpawnedFuture}, backend::{ - AxisSource, Backend, BackendDrmDevice, BackendEvent, Connector, ConnectorEvent, - ConnectorId, ConnectorKernelId, DrmDeviceId, DrmEvent, InputDevice, + AXIS_120, AxisSource, Backend, BackendDrmDevice, BackendEvent, Connector, + ConnectorEvent, ConnectorId, ConnectorKernelId, DrmDeviceId, DrmEvent, InputDevice, InputDeviceAccelProfile, InputDeviceCapability, InputDeviceId, InputEvent, KeyState, - Mode, MonitorInfo, ScrollAxis, TransformMatrix, AXIS_120, + Mode, MonitorInfo, ScrollAxis, TransformMatrix, }, fixed::Fixed, format::XRGB8888, @@ -20,7 +20,7 @@ use { }, video::{ drm::{ConnectorType, Drm, DrmError, DrmVersion}, - gbm::{GbmBo, GbmDevice, GbmError, GBM_BO_USE_RENDERING}, + gbm::{GBM_BO_USE_RENDERING, GbmBo, GbmDevice, GbmError}, }, wire_xcon::{ ChangeProperty, ChangeWindowAttributes, ConfigureNotify, CreateCursor, CreatePixmap, @@ -33,6 +33,7 @@ use { XkbPerClientFlags, XkbUseExtension, }, xcon::{ + Event, XEvent, Xcon, XconError, consts::{ ATOM_STRING, ATOM_WM_CLASS, EVENT_MASK_EXPOSURE, EVENT_MASK_STRUCTURE_NOTIFY, EVENT_MASK_VISIBILITY_CHANGE, GRAB_MODE_ASYNC, GRAB_STATUS_SUCCESS, @@ -46,7 +47,6 @@ use { XI_EVENT_MASK_TOUCH_BEGIN, XI_EVENT_MASK_TOUCH_END, XI_EVENT_MASK_TOUCH_UPDATE, XKB_PER_CLIENT_FLAG_DETECTABLE_AUTO_REPEAT, }, - Event, XEvent, Xcon, XconError, }, }, jay_config::video::GfxApi, diff --git a/src/cli.rs b/src/cli.rs index 6b9542c0..50c92b31 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -21,11 +21,11 @@ use { xwayland::XwaylandArgs, }, compositor::start_compositor, - format::{ref_formats, Format}, + format::{Format, ref_formats}, portal, }, ::log::Level, - clap::{builder::PossibleValue, Args, Parser, Subcommand, ValueEnum, ValueHint}, + clap::{Args, Parser, Subcommand, ValueEnum, ValueHint, builder::PossibleValue}, clap_complete::Shell, }; diff --git a/src/cli/damage_tracking.rs b/src/cli/damage_tracking.rs index 438e80ff..cfc63464 100644 --- a/src/cli/damage_tracking.rs +++ b/src/cli/damage_tracking.rs @@ -1,7 +1,7 @@ use { crate::{ - cli::{color::parse_color, duration::parse_duration, GlobalArgs}, - tools::tool_client::{with_tool_client, ToolClient}, + cli::{GlobalArgs, color::parse_color, duration::parse_duration}, + tools::tool_client::{ToolClient, with_tool_client}, wire::jay_damage_tracking::{SetVisualizerColor, SetVisualizerDecay, SetVisualizerEnabled}, }, clap::{Args, Subcommand}, diff --git a/src/cli/idle.rs b/src/cli/idle.rs index 4ba82b83..21ea21ad 100644 --- a/src/cli/idle.rs +++ b/src/cli/idle.rs @@ -1,9 +1,9 @@ use { crate::{ - cli::{duration::parse_duration, GlobalArgs, IdleArgs}, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + cli::{GlobalArgs, IdleArgs, duration::parse_duration}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, utils::{debug_fn::debug_fn, stack::Stack}, - wire::{jay_compositor, jay_idle, JayIdleId, WlSurfaceId}, + wire::{JayIdleId, WlSurfaceId, jay_compositor, jay_idle}, }, clap::{Args, Subcommand}, std::{cell::Cell, rc::Rc}, diff --git a/src/cli/input.rs b/src/cli/input.rs index 134c6cc4..c83684d0 100644 --- a/src/cli/input.rs +++ b/src/cli/input.rs @@ -6,20 +6,20 @@ use { libinput::consts::{ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE, LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT, }, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, utils::{errorfmt::ErrorFmt, string_ext::StringExt}, - wire::{jay_compositor, jay_input, JayInputId}, + wire::{JayInputId, jay_compositor, jay_input}, }, clap::{Args, Subcommand, ValueEnum, ValueHint}, isnt::std_1::vec::IsntVecExt, std::{ cell::RefCell, - io::{stdin, stdout, Read, Write}, + io::{Read, Write, stdin, stdout}, mem, ops::DerefMut, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Args, Debug)] diff --git a/src/cli/log.rs b/src/cli/log.rs index 20a98a79..2023daf6 100644 --- a/src/cli/log.rs +++ b/src/cli/log.rs @@ -1,7 +1,7 @@ use { crate::{ cli::{GlobalArgs, LogArgs}, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, utils::errorfmt::ErrorFmt, wire::{jay_compositor, jay_log_file}, }, diff --git a/src/cli/quit.rs b/src/cli/quit.rs index 053f2736..5cb03d2d 100644 --- a/src/cli/quit.rs +++ b/src/cli/quit.rs @@ -1,7 +1,7 @@ use { crate::{ cli::GlobalArgs, - tools::tool_client::{with_tool_client, ToolClient}, + tools::tool_client::{ToolClient, with_tool_client}, wire::jay_compositor::Quit, }, std::rc::Rc, diff --git a/src/cli/randr.rs b/src/cli/randr.rs index 34646df4..9ed0e17d 100644 --- a/src/cli/randr.rs +++ b/src/cli/randr.rs @@ -3,9 +3,9 @@ use { cli::GlobalArgs, format::{Format, XRGB8888}, scale::Scale, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, utils::{errorfmt::ErrorFmt, transform_ext::TransformExt}, - wire::{jay_compositor, jay_randr, JayRandrId}, + wire::{JayRandrId, jay_compositor, jay_randr}, }, clap::{Args, Subcommand, ValueEnum}, isnt::std_1::vec::IsntVecExt, diff --git a/src/cli/screenshot.rs b/src/cli/screenshot.rs index 8ff18da2..c9dd0e9a 100644 --- a/src/cli/screenshot.rs +++ b/src/cli/screenshot.rs @@ -4,7 +4,7 @@ use { cli::{GlobalArgs, ScreenshotArgs, ScreenshotFormat}, format::XRGB8888, gfx_apis, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, udmabuf::{Udmabuf, UdmabufError}, utils::{errorfmt::ErrorFmt, queue::AsyncQueue, windows::WindowsExt}, video::{ diff --git a/src/cli/seat_test.rs b/src/cli/seat_test.rs index 8a523971..6afc569b 100644 --- a/src/cli/seat_test.rs +++ b/src/cli/seat_test.rs @@ -2,8 +2,8 @@ use { crate::{ cli::{GlobalArgs, SeatTestArgs}, fixed::Fixed, - ifs::wl_seat::wl_pointer::{PendingScroll, CONTINUOUS, FINGER, WHEEL}, - tools::tool_client::{with_tool_client, Handle, ToolClient}, + ifs::wl_seat::wl_pointer::{CONTINUOUS, FINGER, PendingScroll, WHEEL}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, wire::{ jay_compositor::{GetSeats, Seat, SeatEvents}, jay_seat_events::{ diff --git a/src/cli/set_log_level.rs b/src/cli/set_log_level.rs index abbde8c4..97a00880 100644 --- a/src/cli/set_log_level.rs +++ b/src/cli/set_log_level.rs @@ -1,7 +1,7 @@ use { crate::{ cli::{GlobalArgs, SetLogArgs}, - tools::tool_client::{with_tool_client, ToolClient}, + tools::tool_client::{ToolClient, with_tool_client}, wire::jay_compositor::SetLogLevel, }, std::rc::Rc, diff --git a/src/cli/unlock.rs b/src/cli/unlock.rs index aaec531d..d097f584 100644 --- a/src/cli/unlock.rs +++ b/src/cli/unlock.rs @@ -1,7 +1,7 @@ use { crate::{ cli::GlobalArgs, - tools::tool_client::{with_tool_client, ToolClient}, + tools::tool_client::{ToolClient, with_tool_client}, wire::jay_compositor::Unlock, }, std::rc::Rc, diff --git a/src/cli/xwayland.rs b/src/cli/xwayland.rs index 8bc81e98..bdd0f16e 100644 --- a/src/cli/xwayland.rs +++ b/src/cli/xwayland.rs @@ -1,8 +1,8 @@ use { crate::{ cli::GlobalArgs, - tools::tool_client::{with_tool_client, Handle, ToolClient}, - wire::{jay_compositor, jay_xwayland, JayXwaylandId}, + tools::tool_client::{Handle, ToolClient, with_tool_client}, + wire::{JayXwaylandId, jay_compositor, jay_xwayland}, }, clap::{Args, Subcommand, ValueEnum}, jay_config::xwayland::XScalingMode, diff --git a/src/client.rs b/src/client.rs index 3fcfacda..9fd49a48f 100644 --- a/src/client.rs +++ b/src/client.rs @@ -5,7 +5,7 @@ use { ifs::{ wl_display::WlDisplay, wl_registry::WlRegistry, - wl_surface::{commit_timeline::CommitTimelines, WlSurface}, + wl_surface::{WlSurface, commit_timeline::CommitTimelines}, }, leaks::Tracker, object::{Interface, Object, ObjectId, WL_DISPLAY_ID}, @@ -18,7 +18,7 @@ use { errorfmt::ErrorFmt, numcell::NumCell, pending_serial::PendingSerial, - pid_info::{get_pid_info, get_socket_creds, PidInfo}, + pid_info::{PidInfo, get_pid_info, get_socket_creds}, }, wire::WlRegistryId, }, @@ -32,7 +32,7 @@ use { ops::DerefMut, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub use { error::{ClientError, ParserError}, diff --git a/src/client/objects.rs b/src/client/objects.rs index b6ff7ea5..84a7af46 100644 --- a/src/client/objects.rs +++ b/src/client/objects.rs @@ -22,10 +22,10 @@ use { wl_output::WlOutput, wl_region::WlRegion, wl_registry::WlRegistry, - wl_seat::{tablet::zwp_tablet_tool_v2::ZwpTabletToolV2, wl_pointer::WlPointer, WlSeat}, + wl_seat::{WlSeat, tablet::zwp_tablet_tool_v2::ZwpTabletToolV2, wl_pointer::WlPointer}, wl_surface::{ - xdg_surface::{xdg_popup::XdgPopup, xdg_toplevel::XdgToplevel, XdgSurface}, WlSurface, + xdg_surface::{XdgSurface, xdg_popup::XdgPopup, xdg_toplevel::XdgToplevel}, }, workspace_manager::ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1, wp_drm_lease_connector_v1::WpDrmLeaseConnectorV1, diff --git a/src/client/tasks.rs b/src/client/tasks.rs index 04fff297..5e49ef0d 100644 --- a/src/client/tasks.rs +++ b/src/client/tasks.rs @@ -9,7 +9,7 @@ use { vec_ext::VecExt, }, }, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, std::{collections::VecDeque, mem, rc::Rc, time::Duration}, }; diff --git a/src/clientmem.rs b/src/clientmem.rs index c9428b2e..47a2900e 100644 --- a/src/clientmem.rs +++ b/src/clientmem.rs @@ -12,12 +12,12 @@ use { ops::Deref, ptr, rc::Rc, - sync::atomic::{compiler_fence, Ordering}, + sync::atomic::{Ordering, compiler_fence}, }, thiserror::Error, uapi::{ - c::{self, raise}, OwnedFd, + c::{self, raise}, }, }; diff --git a/src/compositor.rs b/src/compositor.rs index 1467b0c0..ab01b1d5 100644 --- a/src/compositor.rs +++ b/src/compositor.rs @@ -14,7 +14,7 @@ use { clientmem::{self, ClientMemError}, config::ConfigProxy, cpu_worker::{CpuWorker, CpuWorkerError}, - damage::{visualize_damage, DamageVisualizer}, + damage::{DamageVisualizer, visualize_damage}, dbus::Dbus, ei::ei_client::EiClients, forker, @@ -22,7 +22,7 @@ use { ifs::{ jay_screencast::{perform_screencast_realloc, perform_toplevel_screencasts}, wl_output::{OutputId, PersistentOutputState, WlOutputGlobal}, - wl_surface::{zwp_input_popup_surface_v2::input_popup_positioning, NoneSurfaceExt}, + wl_surface::{NoneSurfaceExt, zwp_input_popup_surface_v2::input_popup_positioning}, workspace_manager::workspace_manager_done, }, io_uring::{IoUring, IoUringError}, @@ -37,9 +37,9 @@ use { tasks::{self, handle_const_40hz_latch, idle}, tracy::enable_profiler, tree::{ + DisplayNode, NodeIds, OutputNode, TearingMode, VrrMode, WorkspaceNode, container_layout, container_render_positions, container_render_titles, float_layout, - float_titles, output_render_data, placeholder_render_textures, DisplayNode, NodeIds, - OutputNode, TearingMode, VrrMode, WorkspaceNode, + float_titles, output_render_data, placeholder_render_textures, }, user_session::import_environment, utils::{ diff --git a/src/config.rs b/src/config.rs index 4c6e8297..429714cf 100644 --- a/src/config.rs +++ b/src/config.rs @@ -16,9 +16,8 @@ use { bincode::Options, jay_config::{ _private::{ - bincode_ops, + ConfigEntry, VERSION, bincode_ops, ipc::{InitMessage, ServerFeature, ServerMessage, V1InitMessage}, - ConfigEntry, VERSION, }, input::{InputDevice, Seat, SwitchEvent}, keyboard::{mods::Modifiers, syms::KeySym}, diff --git a/src/config/handler.rs b/src/config/handler.rs index 0be9c0f8..5d8537c5 100644 --- a/src/config/handler.rs +++ b/src/config/handler.rs @@ -16,8 +16,8 @@ use { state::{ConnectorData, DeviceHandlerData, DrmDevData, OutputData, State}, theme::{Color, ThemeSized}, tree::{ - move_ws_to_output, ContainerNode, ContainerSplit, FloatNode, Node, NodeVisitorBase, - OutputNode, TearingMode, VrrMode, WsMoveConfig, + ContainerNode, ContainerSplit, FloatNode, Node, NodeVisitorBase, OutputNode, + TearingMode, VrrMode, WsMoveConfig, move_ws_to_output, }, utils::{ asyncevent::AsyncEvent, @@ -33,19 +33,19 @@ use { bincode::Options, jay_config::{ _private::{ - bincode_ops, + PollableId, WireMode, bincode_ops, ipc::{ClientMessage, Response, ServerMessage, WorkspaceSource}, - PollableId, WireMode, }, + Axis, Direction, Workspace, input::{ - acceleration::{AccelProfile, ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT}, - capability::{ - Capability, CAP_GESTURE, CAP_KEYBOARD, CAP_POINTER, CAP_SWITCH, CAP_TABLET_PAD, - CAP_TABLET_TOOL, CAP_TOUCH, - }, FocusFollowsMouseMode, InputDevice, Seat, + acceleration::{ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT, AccelProfile}, + capability::{ + CAP_GESTURE, CAP_KEYBOARD, CAP_POINTER, CAP_SWITCH, CAP_TABLET_PAD, + CAP_TABLET_TOOL, CAP_TOUCH, Capability, + }, }, - keyboard::{mods::Modifiers, syms::KeySym, Keymap}, + keyboard::{Keymap, mods::Modifiers, syms::KeySym}, logging::LogLevel, theme::{colors::Colorable, sized::Resizable}, timer::Timer as JayTimer, @@ -54,13 +54,12 @@ use { Transform, VrrMode as ConfigVrrMode, }, xwayland::XScalingMode, - Axis, Direction, Workspace, }, libloading::Library, log::Level, std::{cell::Cell, ops::Deref, rc::Rc, sync::Arc, time::Duration}, thiserror::Error, - uapi::{c, fcntl_dupfd_cloexec, OwnedFd}, + uapi::{OwnedFd, c, fcntl_dupfd_cloexec}, }; pub(super) struct ConfigProxyHandler { diff --git a/src/cpu_worker.rs b/src/cpu_worker.rs index fb88dfb4..61ac1bd3 100644 --- a/src/cpu_worker.rs +++ b/src/cpu_worker.rs @@ -23,7 +23,7 @@ use { thread, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub trait CpuJob { diff --git a/src/cpu_worker/jobs/read_write.rs b/src/cpu_worker/jobs/read_write.rs index 2b0e2a19..bb1db28f 100644 --- a/src/cpu_worker/jobs/read_write.rs +++ b/src/cpu_worker/jobs/read_write.rs @@ -10,12 +10,12 @@ use { rc::Rc, slice, sync::{ - atomic::{AtomicBool, AtomicU64, Ordering::Relaxed}, Arc, + atomic::{AtomicBool, AtomicU64, Ordering::Relaxed}, }, }, thiserror::Error, - uapi::{c, Fd}, + uapi::{Fd, c}, }; #[derive(Debug, Error)] diff --git a/src/cpu_worker/tests.rs b/src/cpu_worker/tests.rs index 3b50135a..02f6d0ff 100644 --- a/src/cpu_worker/tests.rs +++ b/src/cpu_worker/tests.rs @@ -7,7 +7,7 @@ use { wheel::Wheel, }, std::{any::Any, future::pending, rc::Rc, sync::Arc}, - uapi::{c::EFD_CLOEXEC, OwnedFd}, + uapi::{OwnedFd, c::EFD_CLOEXEC}, }; struct Job { diff --git a/src/cursor.rs b/src/cursor.rs index 63d14ed5..4f093f93 100644 --- a/src/cursor.rs +++ b/src/cursor.rs @@ -736,8 +736,17 @@ fn parser_cursor_file( let mut images = AHashMap::new(); for position in positions { r.seek(SeekFrom::Start(position as u64))?; - let [_chunk_header, _type_, _size, _version, width, height, xhot, yhot, delay] = - read_u32_n(r)?; + let [ + _chunk_header, + _type_, + _size, + _version, + width, + height, + xhot, + yhot, + delay, + ] = read_u32_n(r)?; let [width, height, xhot, yhot] = u32_to_i32([width, height, xhot, yhot])?; let mut image = XCursorImage { width, @@ -760,7 +769,9 @@ fn parser_cursor_file( } let mut num = targets[0].positions.len(); if num > 1 && targets.iter().any(|t| t.positions.len() != num) { - log::warn!("Cursor file contains animated cursor but not all scales have the same number of images"); + log::warn!( + "Cursor file contains animated cursor but not all scales have the same number of images" + ); num = 1; } let mut res = vec![]; diff --git a/src/cursor_user.rs b/src/cursor_user.rs index 7b6f99a3..56cc89bb 100644 --- a/src/cursor_user.rs +++ b/src/cursor_user.rs @@ -1,7 +1,7 @@ use { crate::{ backend::HardwareCursorUpdate, - cursor::{Cursor, KnownCursor, DEFAULT_CURSOR_SIZE}, + cursor::{Cursor, DEFAULT_CURSOR_SIZE, KnownCursor}, fixed::Fixed, gfx_api::{AcquireSync, ReleaseSync}, rect::Rect, diff --git a/src/dbus.rs b/src/dbus.rs index 4c8037ff..2d79568a 100644 --- a/src/dbus.rs +++ b/src/dbus.rs @@ -17,7 +17,7 @@ use { run_toplevel::RunToplevel, stack::Stack, vecstorage::VecStorage, - xrd::{xrd, XRD}, + xrd::{XRD, xrd}, }, wire_dbus::{ org, @@ -858,8 +858,8 @@ impl MethodHandlerApi for PropertyGetAllHandlerProxy { pub mod prelude { pub use { super::{ - types::{Bool, DictEntry, ObjectPath, Variant}, DbusError, DbusType, Formatter, Message, MethodCall, Parser, Property, Signal, + types::{Bool, DictEntry, ObjectPath, Variant}, }, std::{borrow::Cow, rc::Rc}, uapi::OwnedFd, diff --git a/src/dbus/auth.rs b/src/dbus/auth.rs index 158c5239..48aaecdd 100644 --- a/src/dbus/auth.rs +++ b/src/dbus/auth.rs @@ -1,6 +1,6 @@ use { crate::{ - dbus::{incoming::handle_incoming, outgoing::handle_outgoing, DbusError, DbusSocket}, + dbus::{DbusError, DbusSocket, incoming::handle_incoming, outgoing::handle_outgoing}, utils::{buf::Buf, errorfmt::ErrorFmt, hex}, }, std::{ops::Deref, rc::Rc}, diff --git a/src/dbus/dynamic_type.rs b/src/dbus/dynamic_type.rs index 074586e2..765da57f 100644 --- a/src/dbus/dynamic_type.rs +++ b/src/dbus/dynamic_type.rs @@ -4,7 +4,7 @@ use { TY_SIGNATURE, TY_STRING, TY_UINT16, TY_UINT32, TY_UINT64, TY_UNIX_FD, TY_VARIANT, }, crate::{ - dbus::{types::Variant, DbusError, DynamicType, Parser}, + dbus::{DbusError, DynamicType, Parser, types::Variant}, utils::buf::DynamicBuf, }, std::ops::Deref, diff --git a/src/dbus/formatter.rs b/src/dbus/formatter.rs index fe0789b6..798332e2 100644 --- a/src/dbus/formatter.rs +++ b/src/dbus/formatter.rs @@ -1,6 +1,6 @@ use { crate::{ - dbus::{types::Variant, DbusType, Formatter}, + dbus::{DbusType, Formatter, types::Variant}, utils::buf::DynamicBuf, }, std::rc::Rc, diff --git a/src/dbus/holder.rs b/src/dbus/holder.rs index e9d617c0..156e984e 100644 --- a/src/dbus/holder.rs +++ b/src/dbus/holder.rs @@ -1,7 +1,7 @@ use { crate::{ async_engine::AsyncEngine, - dbus::{auth::handle_auth, DbusError, DbusHolder, DbusSocket}, + dbus::{DbusError, DbusHolder, DbusSocket, auth::handle_auth}, io_uring::IoUring, utils::{bufio::BufIo, errorfmt::ErrorFmt, numcell::NumCell, run_toplevel::RunToplevel}, wire_dbus::org, diff --git a/src/dbus/incoming.rs b/src/dbus/incoming.rs index fa813779..43052b63 100644 --- a/src/dbus/incoming.rs +++ b/src/dbus/incoming.rs @@ -5,9 +5,9 @@ use { }, crate::{ dbus::{ - CallError, DbusError, DbusSocket, Headers, MemberHandlerKey, Message, MethodHandlerApi, - Parser, PropertyGetAllHandlerProxy, PropertyGetHandlerProxy, MSG_ERROR, - MSG_METHOD_CALL, MSG_METHOD_RETURN, MSG_SIGNAL, NO_REPLY_EXPECTED, + CallError, DbusError, DbusSocket, Headers, MSG_ERROR, MSG_METHOD_CALL, + MSG_METHOD_RETURN, MSG_SIGNAL, MemberHandlerKey, Message, MethodHandlerApi, + NO_REPLY_EXPECTED, Parser, PropertyGetAllHandlerProxy, PropertyGetHandlerProxy, }, utils::{ bitflags::BitflagsExt, diff --git a/src/dbus/parser.rs b/src/dbus/parser.rs index a50df86a..95b2525c 100644 --- a/src/dbus/parser.rs +++ b/src/dbus/parser.rs @@ -1,7 +1,7 @@ use { crate::dbus::{ - types::{Bool, ObjectPath, Signature, Variant, FALSE, TRUE}, DbusError, DbusType, DynamicType, Parser, + types::{Bool, FALSE, ObjectPath, Signature, TRUE, Variant}, }, bstr::ByteSlice, std::{borrow::Cow, rc::Rc}, diff --git a/src/dbus/socket.rs b/src/dbus/socket.rs index 58242328..9b688b0a 100644 --- a/src/dbus/socket.rs +++ b/src/dbus/socket.rs @@ -1,15 +1,15 @@ use { crate::{ dbus::{ + AsyncProperty, AsyncReply, AsyncReplySlot, BUS_DEST, BUS_PATH, DbusError, DbusObject, + DbusObjectData, DbusSocket, DbusType, ErrorMessage, Formatter, HDR_DESTINATION, + HDR_ERROR_NAME, HDR_INTERFACE, HDR_MEMBER, HDR_PATH, HDR_REPLY_SERIAL, HDR_SIGNATURE, + HDR_UNIX_FDS, Headers, InterfaceSignalHandlers, MSG_ERROR, MSG_METHOD_CALL, + MSG_METHOD_RETURN, MSG_SIGNAL, Message, MethodCall, NO_REPLY_EXPECTED, Parser, + Property, Reply, ReplyHandler, Signal, SignalHandler, SignalHandlerApi, + SignalHandlerData, property::Get, types::{ObjectPath, Signature, Variant}, - AsyncProperty, AsyncReply, AsyncReplySlot, DbusError, DbusObject, DbusObjectData, - DbusSocket, DbusType, ErrorMessage, Formatter, Headers, InterfaceSignalHandlers, - Message, MethodCall, Parser, Property, Reply, ReplyHandler, Signal, SignalHandler, - SignalHandlerApi, SignalHandlerData, BUS_DEST, BUS_PATH, HDR_DESTINATION, - HDR_ERROR_NAME, HDR_INTERFACE, HDR_MEMBER, HDR_PATH, HDR_REPLY_SERIAL, HDR_SIGNATURE, - HDR_UNIX_FDS, MSG_ERROR, MSG_METHOD_CALL, MSG_METHOD_RETURN, MSG_SIGNAL, - NO_REPLY_EXPECTED, }, utils::{bufio::BufIoMessage, errorfmt::ErrorFmt}, wire_dbus::org, diff --git a/src/drm_feedback.rs b/src/drm_feedback.rs index 136aa2f9..e83a092d 100644 --- a/src/drm_feedback.rs +++ b/src/drm_feedback.rs @@ -4,7 +4,7 @@ use { byteorder::{NativeEndian, WriteBytesExt}, std::{io::Write, rc::Rc}, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; linear_ids!(DrmFeedbackIds, DrmFeedbackId); diff --git a/src/ei/ei_acceptor.rs b/src/ei/ei_acceptor.rs index 8f5a57b8..b11ebf9e 100644 --- a/src/ei/ei_acceptor.rs +++ b/src/ei/ei_acceptor.rs @@ -6,7 +6,7 @@ use { }, std::rc::Rc, thiserror::Error, - uapi::{c, format_ustr, Errno, OwnedFd, Ustring}, + uapi::{Errno, OwnedFd, Ustring, c, format_ustr}, }; #[derive(Debug, Error)] diff --git a/src/ei/ei_client.rs b/src/ei/ei_client.rs index a749682c..da3684ce 100644 --- a/src/ei/ei_client.rs +++ b/src/ei/ei_client.rs @@ -4,10 +4,10 @@ use { async_engine::SpawnedFuture, client::ClientId, ei::{ + EiContext, EiInterfaceVersion, ei_client::ei_objects::EiObjects, ei_ifs::{ei_connection::EiConnection, ei_handshake::EiHandshake}, ei_object::{EiInterface, EiObject, EiObjectId}, - EiContext, EiInterfaceVersion, }, ifs::wl_seat::WlSeatGlobal, leaks::Tracker, @@ -19,7 +19,7 @@ use { debug_fn::debug_fn, errorfmt::ErrorFmt, numcell::NumCell, - pid_info::{get_pid_info, get_socket_creds, PidInfo}, + pid_info::{PidInfo, get_pid_info, get_socket_creds}, }, wire_ei::EiInterfaceVersions, }, diff --git a/src/ei/ei_client/ei_tasks.rs b/src/ei/ei_client/ei_tasks.rs index 16d3b48b..3e28b729 100644 --- a/src/ei/ei_client/ei_tasks.rs +++ b/src/ei/ei_client/ei_tasks.rs @@ -2,7 +2,7 @@ use { crate::{ async_engine::Phase, ei::{ - ei_client::{ei_error::EiClientError, EiClient}, + ei_client::{EiClient, ei_error::EiClientError}, ei_object::EiObjectId, }, utils::{ @@ -11,7 +11,7 @@ use { vec_ext::VecExt, }, }, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, std::{collections::VecDeque, mem, rc::Rc, time::Duration}, }; diff --git a/src/ei/ei_ifs/ei_button.rs b/src/ei/ei_ifs/ei_button.rs index fc3aa200..31ccd5ff 100644 --- a/src/ei/ei_ifs/ei_button.rs +++ b/src/ei/ei_ifs/ei_button.rs @@ -8,8 +8,8 @@ use { }, leaks::Tracker, wire_ei::{ - ei_button::{ClientButton, EiButtonRequestHandler, Release, ServerButton}, EiButtonId, + ei_button::{ClientButton, EiButtonRequestHandler, Release, ServerButton}, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_callback.rs b/src/ei/ei_ifs/ei_callback.rs index f65ed15e..33f42710 100644 --- a/src/ei/ei_ifs/ei_callback.rs +++ b/src/ei/ei_ifs/ei_callback.rs @@ -6,8 +6,8 @@ use { }, leaks::Tracker, wire_ei::{ - ei_callback::{Done, EiCallbackRequestHandler}, EiCallbackId, + ei_callback::{Done, EiCallbackRequestHandler}, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_connection.rs b/src/ei/ei_ifs/ei_connection.rs index 88270e38..23bf6080 100644 --- a/src/ei/ei_ifs/ei_connection.rs +++ b/src/ei/ei_ifs/ei_connection.rs @@ -1,25 +1,25 @@ use { crate::{ ei::{ + EiContext, ei_client::{EiClient, EiClientError}, ei_ifs::{ ei_callback::EiCallback, ei_seat::{ - EiSeat, EI_CAP_BUTTON, EI_CAP_KEYBOARD, EI_CAP_POINTER, - EI_CAP_POINTER_ABSOLUTE, EI_CAP_SCROLL, EI_CAP_TOUCHSCREEN, + EI_CAP_BUTTON, EI_CAP_KEYBOARD, EI_CAP_POINTER, EI_CAP_POINTER_ABSOLUTE, + EI_CAP_SCROLL, EI_CAP_TOUCHSCREEN, EiSeat, }, }, ei_object::{EiObject, EiObjectId, EiVersion}, - EiContext, }, ifs::wl_seat::WlSeatGlobal, leaks::Tracker, wire_ei::{ + EiButton, EiConnectionId, EiKeyboard, EiPointer, EiPointerAbsolute, EiScroll, + EiTouchscreen, ei_connection::{ Disconnect, Disconnected, EiConnectionRequestHandler, InvalidObject, Seat, }, - EiButton, EiConnectionId, EiKeyboard, EiPointer, EiPointerAbsolute, EiScroll, - EiTouchscreen, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ei/ei_ifs/ei_device.rs b/src/ei/ei_ifs/ei_device.rs index 4c09e11e..c29e701a 100644 --- a/src/ei/ei_ifs/ei_device.rs +++ b/src/ei/ei_ifs/ei_device.rs @@ -13,12 +13,12 @@ use { scale::Scale, utils::{copyhashmap::CopyHashMap, syncqueue::SyncQueue}, wire_ei::{ + EiDeviceId, ei_device::{ ClientFrame, ClientStartEmulating, ClientStopEmulating, Destroyed, DeviceType, Done, EiDeviceRequestHandler, Interface, Paused, Region, RegionMappingId, Release, Resumed, ServerFrame, ServerStartEmulating, }, - EiDeviceId, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ei/ei_ifs/ei_handshake.rs b/src/ei/ei_ifs/ei_handshake.rs index 759db643..6eb813e9 100644 --- a/src/ei/ei_ifs/ei_handshake.rs +++ b/src/ei/ei_ifs/ei_handshake.rs @@ -1,19 +1,19 @@ use { crate::{ ei::{ + EiContext, ei_client::{EiClient, EiClientError}, ei_ifs::ei_connection::EiConnection, - ei_object::{EiInterface, EiObject, EiVersion, EI_HANDSHAKE_ID}, - EiContext, + ei_object::{EI_HANDSHAKE_ID, EiInterface, EiObject, EiVersion}, }, leaks::Tracker, wire_ei::{ + EiHandshake, EiHandshakeId, ei_handshake::{ ClientHandshakeVersion, ClientInterfaceVersion, Connection, ContextType, EiHandshakeRequestHandler, Finish, Name, ServerHandshakeVersion, ServerInterfaceVersion, }, - EiHandshake, EiHandshakeId, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ei/ei_ifs/ei_keyboard.rs b/src/ei/ei_ifs/ei_keyboard.rs index b17a9c55..b57d1581 100644 --- a/src/ei/ei_ifs/ei_keyboard.rs +++ b/src/ei/ei_ifs/ei_keyboard.rs @@ -9,10 +9,10 @@ use { keyboard::KeyboardState, leaks::Tracker, wire_ei::{ + EiKeyboardId, ei_keyboard::{ ClientKey, EiKeyboardRequestHandler, Keymap, Modifiers, Release, ServerKey, }, - EiKeyboardId, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_pingpong.rs b/src/ei/ei_ifs/ei_pingpong.rs index 5c132420..cabb926a 100644 --- a/src/ei/ei_ifs/ei_pingpong.rs +++ b/src/ei/ei_ifs/ei_pingpong.rs @@ -6,8 +6,8 @@ use { }, leaks::Tracker, wire_ei::{ - ei_pingpong::{Done, EiPingpongRequestHandler}, EiPingpongId, + ei_pingpong::{Done, EiPingpongRequestHandler}, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_pointer.rs b/src/ei/ei_ifs/ei_pointer.rs index 85038da7..99eee09e 100644 --- a/src/ei/ei_ifs/ei_pointer.rs +++ b/src/ei/ei_ifs/ei_pointer.rs @@ -8,10 +8,10 @@ use { fixed::Fixed, leaks::Tracker, wire_ei::{ + EiPointerId, ei_pointer::{ ClientMotionRelative, EiPointerRequestHandler, Release, ServerMotionRelative, }, - EiPointerId, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_pointer_absolute.rs b/src/ei/ei_ifs/ei_pointer_absolute.rs index cd1cfe79..e07e6b83 100644 --- a/src/ei/ei_ifs/ei_pointer_absolute.rs +++ b/src/ei/ei_ifs/ei_pointer_absolute.rs @@ -8,11 +8,11 @@ use { fixed::Fixed, leaks::Tracker, wire_ei::{ + EiPointerAbsoluteId, ei_pointer_absolute::{ ClientMotionAbsolute, EiPointerAbsoluteRequestHandler, Release, ServerMotionAbsolute, }, - EiPointerAbsoluteId, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_scroll.rs b/src/ei/ei_ifs/ei_scroll.rs index 93ae2e61..9f6efed4 100644 --- a/src/ei/ei_ifs/ei_scroll.rs +++ b/src/ei/ei_ifs/ei_scroll.rs @@ -8,11 +8,11 @@ use { fixed::Fixed, leaks::Tracker, wire_ei::{ + EiScrollId, ei_scroll::{ ClientScroll, ClientScrollDiscrete, ClientScrollStop, EiScrollRequestHandler, Release, ServerScroll, ServerScrollDiscrete, ServerScrollStop, }, - EiScrollId, }, }, std::rc::Rc, diff --git a/src/ei/ei_ifs/ei_seat.rs b/src/ei/ei_ifs/ei_seat.rs index 1177e1ea..45264283 100644 --- a/src/ei/ei_ifs/ei_seat.rs +++ b/src/ei/ei_ifs/ei_seat.rs @@ -2,10 +2,11 @@ use { crate::{ backend::KeyState, ei::{ + EiContext, ei_client::{EiClient, EiClientError}, ei_ifs::{ ei_button::EiButton, - ei_device::{EiDevice, EiDeviceInterface, EI_DEVICE_TYPE_VIRTUAL}, + ei_device::{EI_DEVICE_TYPE_VIRTUAL, EiDevice, EiDeviceInterface}, ei_keyboard::EiKeyboard, ei_pointer::EiPointer, ei_pointer_absolute::EiPointerAbsolute, @@ -13,19 +14,18 @@ use { ei_touchscreen::EiTouchscreen, }, ei_object::{EiInterface, EiObject, EiVersion}, - EiContext, }, fixed::Fixed, - ifs::wl_seat::{wl_pointer::PendingScroll, PhysicalKeyboardId, WlSeatGlobal}, + ifs::wl_seat::{PhysicalKeyboardId, WlSeatGlobal, wl_pointer::PendingScroll}, keyboard::{DynKeyboardState, KeyboardState, KeyboardStateId}, leaks::Tracker, tree::Node, utils::{array, bitflags::BitflagsExt, clonecell::CloneCell}, wire_ei::{ + EiSeatId, ei_seat::{ Bind, Capability, Destroyed, Device, Done, EiSeatRequestHandler, Name, Release, }, - EiSeatId, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ei/ei_ifs/ei_touchscreen.rs b/src/ei/ei_ifs/ei_touchscreen.rs index b9bb8dfb..3b9a63a5 100644 --- a/src/ei/ei_ifs/ei_touchscreen.rs +++ b/src/ei/ei_ifs/ei_touchscreen.rs @@ -9,11 +9,11 @@ use { leaks::Tracker, utils::clonecell::UnsafeCellCloneSafe, wire_ei::{ + EiTouchscreenId, ei_touchscreen::{ ClientCancel, ClientDown, ClientMotion, ClientUp, EiTouchscreenRequestHandler, Release, ServerCancel, ServerDown, ServerMotion, ServerUp, }, - EiTouchscreenId, }, }, std::{collections::hash_map::Entry, rc::Rc}, diff --git a/src/ei/ei_object.rs b/src/ei/ei_object.rs index 57c860a0..c79c78a3 100644 --- a/src/ei/ei_object.rs +++ b/src/ei/ei_object.rs @@ -1,8 +1,8 @@ use { crate::{ ei::{ - ei_client::{EiClient, EiClientError}, EiContext, + ei_client::{EiClient, EiClientError}, }, utils::buffd::EiMsgParser, wire_ei::EiHandshakeId, diff --git a/src/forker.rs b/src/forker.rs index 9d5de15c..1dc12b98 100644 --- a/src/forker.rs +++ b/src/forker.rs @@ -9,7 +9,7 @@ use { state::State, utils::{ buffd::BufFdError, - clone3::{fork_with_pidfd, Forked}, + clone3::{Forked, fork_with_pidfd}, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, numcell::NumCell, @@ -33,7 +33,7 @@ use { task::{Poll, Waker}, }, thiserror::Error, - uapi::{c, pipe2, Errno, Fd, IntoUstr, OwnedFd, UstrPtr}, + uapi::{Errno, Fd, IntoUstr, OwnedFd, UstrPtr, c, pipe2}, }; pub struct ForkerProxy { diff --git a/src/forker/io.rs b/src/forker/io.rs index 37f40cd5..6018b19a 100644 --- a/src/forker/io.rs +++ b/src/forker/io.rs @@ -1,6 +1,6 @@ use { bincode::Options, - serde::{de::DeserializeOwned, Serialize}, + serde::{Serialize, de::DeserializeOwned}, std::{mem, rc::Rc}, }; diff --git a/src/format.rs b/src/format.rs index 392378a3..03dec08d 100644 --- a/src/format.rs +++ b/src/format.rs @@ -1,13 +1,13 @@ use { crate::{ - gfx_apis::gl::sys::{GLenum, GLint, GL_BGRA_EXT, GL_RGBA, GL_RGBA8, GL_UNSIGNED_BYTE}, + gfx_apis::gl::sys::{GL_BGRA_EXT, GL_RGBA, GL_RGBA8, GL_UNSIGNED_BYTE, GLenum, GLint}, pipewire::pw_pod::{ - SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_xBGR_210LE, - SPA_VIDEO_FORMAT_xRGB_210LE, SpaVideoFormat, SPA_VIDEO_FORMAT_ABGR_210LE, - SPA_VIDEO_FORMAT_ARGB_210LE, SPA_VIDEO_FORMAT_BGR, SPA_VIDEO_FORMAT_BGR15, - SPA_VIDEO_FORMAT_BGR16, SPA_VIDEO_FORMAT_BGRA, SPA_VIDEO_FORMAT_GRAY8, - SPA_VIDEO_FORMAT_RGB, SPA_VIDEO_FORMAT_RGB16, SPA_VIDEO_FORMAT_RGBA, - SPA_VIDEO_FORMAT_UNKNOWN, + SPA_VIDEO_FORMAT_ABGR_210LE, SPA_VIDEO_FORMAT_ARGB_210LE, SPA_VIDEO_FORMAT_BGR, + SPA_VIDEO_FORMAT_BGR15, SPA_VIDEO_FORMAT_BGR16, SPA_VIDEO_FORMAT_BGRA, + SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_GRAY8, SPA_VIDEO_FORMAT_RGB, + SPA_VIDEO_FORMAT_RGB16, SPA_VIDEO_FORMAT_RGBA, SPA_VIDEO_FORMAT_RGBx, + SPA_VIDEO_FORMAT_UNKNOWN, SPA_VIDEO_FORMAT_xBGR_210LE, SPA_VIDEO_FORMAT_xRGB_210LE, + SpaVideoFormat, }, utils::debug_fn::debug_fn, }, diff --git a/src/gfx_api.rs b/src/gfx_api.rs index 3176a0c5..3bb4acba 100644 --- a/src/gfx_api.rs +++ b/src/gfx_api.rs @@ -7,13 +7,13 @@ use { fixed::Fixed, format::Format, rect::{Rect, Region}, - renderer::{renderer_base::RendererBase, Renderer}, + renderer::{Renderer, renderer_base::RendererBase}, scale::Scale, state::State, theme::Color, tree::{Node, OutputNode}, utils::{clonecell::UnsafeCellCloneSafe, transform_ext::TransformExt}, - video::{dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx, Modifier}, + video::{Modifier, dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx}, }, ahash::AHashMap, indexmap::{IndexMap, IndexSet}, diff --git a/src/gfx_apis/gl.rs b/src/gfx_apis/gl.rs index 284e8131..bbf7ce77 100644 --- a/src/gfx_apis/gl.rs +++ b/src/gfx_apis/gl.rs @@ -80,8 +80,8 @@ use { texture::Texture, }, sys::{ - GL_BLEND, GL_FALSE, GL_FLOAT, GL_LINEAR, GL_TEXTURE0, GL_TEXTURE_MIN_FILTER, - GL_TRIANGLES, GL_TRIANGLE_STRIP, + GL_BLEND, GL_FALSE, GL_FLOAT, GL_LINEAR, GL_TEXTURE_MIN_FILTER, GL_TEXTURE0, + GL_TRIANGLE_STRIP, GL_TRIANGLES, }, }, theme::Color, @@ -339,7 +339,9 @@ fn render_texture(ctx: &GlRenderContext, tex: &CopyTexture) { true => match &ctx.tex_external { Some(p) => p, _ => { - log::error!("Trying to render an external-only texture but context does not support the required extension"); + log::error!( + "Trying to render an external-only texture but context does not support the required extension" + ); return; } }, diff --git a/src/gfx_apis/gl/egl.rs b/src/gfx_apis/gl/egl.rs index b6f1cab4..e9adf21a 100644 --- a/src/gfx_apis/gl/egl.rs +++ b/src/gfx_apis/gl/egl.rs @@ -1,14 +1,14 @@ use { crate::gfx_apis::gl::{ + RenderError, egl::sys::{ - EGLAttrib, EGLLabelKHR, EGLenum, EGLint, EGL_DEBUG_MSG_CRITICAL_KHR, - EGL_DEBUG_MSG_ERROR_KHR, EGL_DEBUG_MSG_INFO_KHR, EGL_DEBUG_MSG_WARN_KHR, EGL_NONE, - EGL_OPENGL_ES_API, EGL_TRUE, + EGL_DEBUG_MSG_CRITICAL_KHR, EGL_DEBUG_MSG_ERROR_KHR, EGL_DEBUG_MSG_INFO_KHR, + EGL_DEBUG_MSG_WARN_KHR, EGL_NONE, EGL_OPENGL_ES_API, EGL_TRUE, EGLAttrib, EGLLabelKHR, + EGLenum, EGLint, }, - ext::{get_client_ext, ClientExt, EXT_PLATFORM_BASE, KHR_DEBUG, KHR_PLATFORM_GBM}, + ext::{ClientExt, EXT_PLATFORM_BASE, KHR_DEBUG, KHR_PLATFORM_GBM, get_client_ext}, proc::ExtProc, sys::EGL, - RenderError, }, bstr::ByteSlice, log::Level, diff --git a/src/gfx_apis/gl/egl/context.rs b/src/gfx_apis/gl/egl/context.rs index bf511d70..4cd7ab65 100644 --- a/src/gfx_apis/gl/egl/context.rs +++ b/src/gfx_apis/gl/egl/context.rs @@ -2,16 +2,16 @@ use { crate::{ gfx_api::{GfxFormat, ResetStatus}, gfx_apis::gl::{ + RenderError, egl::{ display::EglDisplay, - sys::{EGLContext, EGLSurface, EGL_FALSE, EGL_TRUE}, + sys::{EGL_FALSE, EGL_TRUE, EGLContext, EGLSurface}, }, - ext::{GlExt, EXT_CREATE_CONTEXT_ROBUSTNESS}, + ext::{EXT_CREATE_CONTEXT_ROBUSTNESS, GlExt}, sys::{ GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB, GL_UNKNOWN_CONTEXT_RESET_ARB, }, - RenderError, }, }, ahash::AHashMap, diff --git a/src/gfx_apis/gl/egl/display.rs b/src/gfx_apis/gl/egl/display.rs index e3995681..7915fad3 100644 --- a/src/gfx_apis/gl/egl/display.rs +++ b/src/gfx_apis/gl/egl/display.rs @@ -1,13 +1,14 @@ use { crate::{ - format::{formats, Format}, + format::{Format, formats}, gfx_api::{GfxFormat, GfxWriteModifier}, gfx_apis::gl::{ + RenderError, egl::{ + PROCS, context::EglContext, image::EglImage, sys::{ - EGLClientBuffer, EGLConfig, EGLContext, EGLDisplay, EGLint, EGL_CONTEXT_CLIENT_VERSION, EGL_DMA_BUF_PLANE0_FD_EXT, EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, EGL_DMA_BUF_PLANE0_OFFSET_EXT, EGL_DMA_BUF_PLANE0_PITCH_EXT, @@ -20,24 +21,23 @@ use { EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, EGL_DMA_BUF_PLANE3_OFFSET_EXT, EGL_DMA_BUF_PLANE3_PITCH_EXT, EGL_HEIGHT, EGL_IMAGE_PRESERVED_KHR, EGL_LINUX_DMA_BUF_EXT, EGL_LINUX_DRM_FOURCC_EXT, EGL_NONE, EGL_TRUE, EGL_WIDTH, + EGLClientBuffer, EGLConfig, EGLContext, EGLDisplay, EGLint, }, - PROCS, }, ext::{ - get_display_ext, get_gl_ext, DisplayExt, GlExt, ANDROID_NATIVE_FENCE_SYNC, - EXT_CREATE_CONTEXT_ROBUSTNESS, EXT_IMAGE_DMA_BUF_IMPORT_MODIFIERS, - GL_OES_EGL_IMAGE, GL_OES_EGL_IMAGE_EXTERNAL, KHR_FENCE_SYNC, KHR_IMAGE_BASE, - KHR_NO_CONFIG_CONTEXT, KHR_SURFACELESS_CONTEXT, KHR_WAIT_SYNC, - MESA_CONFIGLESS_CONTEXT, + ANDROID_NATIVE_FENCE_SYNC, DisplayExt, EXT_CREATE_CONTEXT_ROBUSTNESS, + EXT_IMAGE_DMA_BUF_IMPORT_MODIFIERS, GL_OES_EGL_IMAGE, GL_OES_EGL_IMAGE_EXTERNAL, + GlExt, KHR_FENCE_SYNC, KHR_IMAGE_BASE, KHR_NO_CONFIG_CONTEXT, + KHR_SURFACELESS_CONTEXT, KHR_WAIT_SYNC, MESA_CONFIGLESS_CONTEXT, get_display_ext, + get_gl_ext, }, proc::ExtProc, sys::{ - Egl, GlesV2, EGL, EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, - EGL_LOSE_CONTEXT_ON_RESET_EXT, EGL_PLATFORM_GBM_KHR, GLESV2, + EGL, EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, + EGL_LOSE_CONTEXT_ON_RESET_EXT, EGL_PLATFORM_GBM_KHR, Egl, GLESV2, GlesV2, }, - RenderError, }, - video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, Modifier, INVALID_MODIFIER}, + video::{INVALID_MODIFIER, Modifier, dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice}, }, ahash::AHashMap, indexmap::{IndexMap, IndexSet}, diff --git a/src/gfx_apis/gl/egl/image.rs b/src/gfx_apis/gl/egl/image.rs index c85d65cb..995cb07b 100644 --- a/src/gfx_apis/gl/egl/image.rs +++ b/src/gfx_apis/gl/egl/image.rs @@ -2,7 +2,7 @@ use { crate::{ gfx_apis::gl::egl::{ display::EglDisplay, - sys::{EGLImageKHR, EGL_FALSE}, + sys::{EGL_FALSE, EGLImageKHR}, }, video::dmabuf::DmaBuf, }, diff --git a/src/gfx_apis/gl/ext.rs b/src/gfx_apis/gl/ext.rs index 3bfbfa65..a4aef071 100644 --- a/src/gfx_apis/gl/ext.rs +++ b/src/gfx_apis/gl/ext.rs @@ -1,9 +1,9 @@ use { crate::gfx_apis::gl::{ - egl::sys::{EGLDisplay, EGL_EXTENSIONS}, + RenderError, + egl::sys::{EGL_EXTENSIONS, EGLDisplay}, gl::sys::GL_EXTENSIONS, sys::{EGL, GLESV2}, - RenderError, }, ahash::AHashSet, bstr::ByteSlice, diff --git a/src/gfx_apis/gl/gl/program.rs b/src/gfx_apis/gl/gl/program.rs index 1e87f2a4..9e5cf213 100644 --- a/src/gfx_apis/gl/gl/program.rs +++ b/src/gfx_apis/gl/gl/program.rs @@ -1,11 +1,11 @@ use { crate::gfx_apis::gl::{ + RenderError, egl::context::EglContext, gl::{ shader::GlShader, - sys::{GLint, GLuint, GL_FALSE, GL_FRAGMENT_SHADER, GL_LINK_STATUS, GL_VERTEX_SHADER}, + sys::{GL_FALSE, GL_FRAGMENT_SHADER, GL_LINK_STATUS, GL_VERTEX_SHADER, GLint, GLuint}, }, - RenderError, }, std::{ffi::CStr, rc::Rc}, }; diff --git a/src/gfx_apis/gl/gl/render_buffer.rs b/src/gfx_apis/gl/gl/render_buffer.rs index 5513794b..5835676d 100644 --- a/src/gfx_apis/gl/gl/render_buffer.rs +++ b/src/gfx_apis/gl/gl/render_buffer.rs @@ -2,15 +2,15 @@ use { crate::{ format::Format, gfx_apis::gl::{ + RenderError, egl::{context::EglContext, image::EglImage}, gl::{ frame_buffer::GlFrameBuffer, sys::{ - GLeglImageOES, GLuint, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER, - GL_FRAMEBUFFER_COMPLETE, GL_RENDERBUFFER, + GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER, GL_FRAMEBUFFER_COMPLETE, GL_RENDERBUFFER, + GLeglImageOES, GLuint, }, }, - RenderError, }, }, std::rc::Rc, diff --git a/src/gfx_apis/gl/gl/shader.rs b/src/gfx_apis/gl/gl/shader.rs index 3812cb56..01bae9d4 100644 --- a/src/gfx_apis/gl/gl/shader.rs +++ b/src/gfx_apis/gl/gl/shader.rs @@ -1,9 +1,9 @@ use { crate::gfx_apis::gl::{ - egl::context::EglContext, - gl::sys::{GLenum, GLuint, GL_COMPILE_STATUS, GL_FALSE}, - sys::GLint, RenderError, + egl::context::EglContext, + gl::sys::{GL_COMPILE_STATUS, GL_FALSE, GLenum, GLuint}, + sys::GLint, }, std::rc::Rc, }; diff --git a/src/gfx_apis/gl/gl/texture.rs b/src/gfx_apis/gl/gl/texture.rs index d6ab3e02..f1491bd9 100644 --- a/src/gfx_apis/gl/gl/texture.rs +++ b/src/gfx_apis/gl/gl/texture.rs @@ -2,14 +2,14 @@ use { crate::{ format::Format, gfx_apis::gl::{ + RenderError, egl::{context::EglContext, image::EglImage}, ext::GL_OES_EGL_IMAGE_EXTERNAL, gl::sys::{ - GLint, GLuint, GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, - GL_TEXTURE_WRAP_T, GL_UNPACK_ROW_LENGTH_EXT, + GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, + GL_UNPACK_ROW_LENGTH_EXT, GLint, GLuint, }, - sys::{GLeglImageOES, GLenum, GL_TEXTURE_EXTERNAL_OES}, - RenderError, + sys::{GL_TEXTURE_EXTERNAL_OES, GLeglImageOES, GLenum}, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/gfx_apis/gl/renderer/context.rs b/src/gfx_apis/gl/renderer/context.rs index 25768558..59dbbfe4 100644 --- a/src/gfx_apis/gl/renderer/context.rs +++ b/src/gfx_apis/gl/renderer/context.rs @@ -8,24 +8,24 @@ use { GfxImage, GfxInternalFramebuffer, ResetStatus, ShmGfxTexture, }, gfx_apis::gl::{ + GfxGlState, RenderError, Texture, egl::{context::EglContext, display::EglDisplay, image::EglImage}, ext::GL_OES_EGL_IMAGE_EXTERNAL, gl::{ program::GlProgram, render_buffer::GlRenderBuffer, sys::GLint, texture::GlTexture, }, renderer::{framebuffer::Framebuffer, image::Image}, - GfxGlState, RenderError, Texture, }, rect::Rect, video::{ dmabuf::DmaBuf, - drm::{sync_obj::SyncObjCtx, Drm}, + drm::{Drm, sync_obj::SyncObjCtx}, gbm::GbmDevice, }, }, ahash::AHashMap, jay_config::video::GfxApi, - linearize::{static_map, Linearize, StaticMap}, + linearize::{Linearize, StaticMap, static_map}, std::{ cell::{Cell, RefCell}, ffi::CString, diff --git a/src/gfx_apis/gl/renderer/framebuffer.rs b/src/gfx_apis/gl/renderer/framebuffer.rs index 810c81b8..8da5ccbe 100644 --- a/src/gfx_apis/gl/renderer/framebuffer.rs +++ b/src/gfx_apis/gl/renderer/framebuffer.rs @@ -7,6 +7,7 @@ use { SyncFile, }, gfx_apis::gl::{ + RenderError, gl::{ frame_buffer::GlFrameBuffer, sys::{GL_COLOR_BUFFER_BIT, GL_FRAMEBUFFER}, @@ -15,7 +16,6 @@ use { renderer::context::GlRenderContext, run_ops, sys::{GL_ONE, GL_ONE_MINUS_SRC_ALPHA}, - RenderError, }, rect::Region, theme::Color, diff --git a/src/gfx_apis/gl/renderer/image.rs b/src/gfx_apis/gl/renderer/image.rs index 626d3431..a67876d4 100644 --- a/src/gfx_apis/gl/renderer/image.rs +++ b/src/gfx_apis/gl/renderer/image.rs @@ -2,8 +2,8 @@ use { crate::{ gfx_api::{GfxError, GfxFramebuffer, GfxImage, GfxTexture}, gfx_apis::gl::{ - egl::image::EglImage, gl::texture::GlTexture, Framebuffer, GlRenderContext, - RenderError, Texture, + Framebuffer, GlRenderContext, RenderError, Texture, egl::image::EglImage, + gl::texture::GlTexture, }, }, std::rc::Rc, diff --git a/src/gfx_apis/gl/renderer/sync.rs b/src/gfx_apis/gl/renderer/sync.rs index 588791bd..43afa5ad 100644 --- a/src/gfx_apis/gl/renderer/sync.rs +++ b/src/gfx_apis/gl/renderer/sync.rs @@ -1,12 +1,12 @@ use { crate::{ gfx_apis::gl::{ + RenderError, egl::context::EglContext, sys::{ - EGLBoolean, EGLSyncKHR, EGL_NONE, EGL_SYNC_NATIVE_FENCE_ANDROID, - EGL_SYNC_NATIVE_FENCE_FD_ANDROID, EGL_TRUE, + EGL_NONE, EGL_SYNC_NATIVE_FENCE_ANDROID, EGL_SYNC_NATIVE_FENCE_FD_ANDROID, + EGL_TRUE, EGLBoolean, EGLSyncKHR, }, - RenderError, }, utils::errorfmt::ErrorFmt, }, diff --git a/src/gfx_apis/gl/renderer/texture.rs b/src/gfx_apis/gl/renderer/texture.rs index a4172059..1055557f 100644 --- a/src/gfx_apis/gl/renderer/texture.rs +++ b/src/gfx_apis/gl/renderer/texture.rs @@ -6,13 +6,13 @@ use { PendingShmTransfer, ShmGfxTexture, ShmMemory, }, gfx_apis::gl::{ + RenderError, gl::texture::GlTexture, renderer::context::GlRenderContext, sys::{ - GLint, GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, - GL_UNPACK_ROW_LENGTH_EXT, + GL_CLAMP_TO_EDGE, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, + GL_UNPACK_ROW_LENGTH_EXT, GLint, }, - RenderError, }, rect::Region, video::dmabuf::DmaBuf, diff --git a/src/gfx_apis/vulkan.rs b/src/gfx_apis/vulkan.rs index 45ac392e..d48e9526 100644 --- a/src/gfx_apis/vulkan.rs +++ b/src/gfx_apis/vulkan.rs @@ -21,12 +21,12 @@ use { crate::{ allocator::{Allocator, AllocatorError}, async_engine::AsyncEngine, - cpu_worker::{jobs::read_write::ReadWriteJobError, CpuWorker}, + cpu_worker::{CpuWorker, jobs::read_write::ReadWriteJobError}, format::Format, gfx_api::{ AsyncShmGfxTexture, GfxContext, GfxError, GfxFormat, GfxImage, GfxInternalFramebuffer, - GfxStagingBuffer, ResetStatus, ShmGfxTexture, StagingBufferUsecase, STAGING_DOWNLOAD, - STAGING_UPLOAD, + GfxStagingBuffer, ResetStatus, STAGING_DOWNLOAD, STAGING_UPLOAD, ShmGfxTexture, + StagingBufferUsecase, }, gfx_apis::vulkan::{ image::VulkanImageMemory, instance::VulkanInstance, renderer::VulkanRenderer, @@ -36,12 +36,12 @@ use { utils::oserror::OsError, video::{ dmabuf::DmaBuf, - drm::{sync_obj::SyncObjCtx, Drm, DrmError}, + drm::{Drm, DrmError, sync_obj::SyncObjCtx}, gbm::GbmError, }, }, ahash::AHashMap, - ash::{vk, LoadingError}, + ash::{LoadingError, vk}, gpu_alloc::{AllocationError, MapError}, jay_config::video::GfxApi, log::Level, diff --git a/src/gfx_apis/vulkan/allocator.rs b/src/gfx_apis/vulkan/allocator.rs index 035b5db4..ab8c55c0 100644 --- a/src/gfx_apis/vulkan/allocator.rs +++ b/src/gfx_apis/vulkan/allocator.rs @@ -2,13 +2,13 @@ use { crate::{ cpu_worker::{AsyncCpuWork, CpuJob, CpuWork, CpuWorker}, gfx_apis::vulkan::{ - device::VulkanDevice, instance::API_VERSION, renderer::VulkanRenderer, VulkanError, + VulkanError, device::VulkanDevice, instance::API_VERSION, renderer::VulkanRenderer, }, utils::{numcell::NumCell, ptr_ext::MutPtrExt}, }, ash::{ - vk::{DeviceMemory, DeviceSize, MappedMemoryRange, MemoryRequirements}, Device, + vk::{DeviceMemory, DeviceSize, MappedMemoryRange, MemoryRequirements}, }, gpu_alloc::{Config, GpuAllocator, MemoryBlock, MemoryPropertyFlags, Request, UsageFlags}, gpu_alloc_ash::AshMemoryDevice, diff --git a/src/gfx_apis/vulkan/bo_allocator.rs b/src/gfx_apis/vulkan/bo_allocator.rs index 5b083dcb..4afa8af4 100644 --- a/src/gfx_apis/vulkan/bo_allocator.rs +++ b/src/gfx_apis/vulkan/bo_allocator.rs @@ -1,20 +1,20 @@ use { crate::{ allocator::{ - Allocator, AllocatorError, BufferObject, BufferUsage, MappedBuffer, BO_USE_RENDERING, - BO_USE_WRITE, + Allocator, AllocatorError, BO_USE_RENDERING, BO_USE_WRITE, BufferObject, BufferUsage, + MappedBuffer, }, format::Format, gfx_apis::vulkan::{ - allocator::VulkanAllocator, command::VulkanCommandBuffer, device::VulkanDevice, - format::VulkanFormat, renderer::image_barrier, staging::VulkanStagingBuffer, - VulkanError, + VulkanError, allocator::VulkanAllocator, command::VulkanCommandBuffer, + device::VulkanDevice, format::VulkanFormat, renderer::image_barrier, + staging::VulkanStagingBuffer, }, utils::{errorfmt::ErrorFmt, on_drop::OnDrop}, video::{ + Modifier, dmabuf::{DmaBuf, DmaBufIds, DmaBufPlane, PlaneVec}, drm::Drm, - Modifier, }, }, arrayvec::ArrayVec, @@ -30,8 +30,8 @@ use { ImageSubresource, ImageSubresourceLayers, ImageTiling, ImageType, ImageUsageFlags, ImportMemoryFdInfoKHR, MemoryAllocateInfo, MemoryDedicatedAllocateInfo, MemoryFdPropertiesKHR, MemoryGetFdInfoKHR, MemoryPropertyFlags, MemoryRequirements2, - PipelineStageFlags2, SampleCountFlags, SharingMode, SubmitInfo2, SubresourceLayout, - QUEUE_FAMILY_FOREIGN_EXT, + PipelineStageFlags2, QUEUE_FAMILY_FOREIGN_EXT, SampleCountFlags, SharingMode, SubmitInfo2, + SubresourceLayout, }, std::{rc::Rc, slice}, uapi::OwnedFd, diff --git a/src/gfx_apis/vulkan/command.rs b/src/gfx_apis/vulkan/command.rs index c3edceb0..c6e3670c 100644 --- a/src/gfx_apis/vulkan/command.rs +++ b/src/gfx_apis/vulkan/command.rs @@ -1,5 +1,5 @@ use { - crate::gfx_apis::vulkan::{device::VulkanDevice, renderer::CachedCommandBuffers, VulkanError}, + crate::gfx_apis::vulkan::{VulkanError, device::VulkanDevice, renderer::CachedCommandBuffers}, ash::vk::{ CommandBuffer, CommandBufferAllocateInfo, CommandBufferLevel, CommandPool, CommandPoolCreateFlags, CommandPoolCreateInfo, diff --git a/src/gfx_apis/vulkan/descriptor.rs b/src/gfx_apis/vulkan/descriptor.rs index 90ea32b7..64807b38 100644 --- a/src/gfx_apis/vulkan/descriptor.rs +++ b/src/gfx_apis/vulkan/descriptor.rs @@ -1,5 +1,5 @@ use { - crate::gfx_apis::vulkan::{device::VulkanDevice, sampler::VulkanSampler, VulkanError}, + crate::gfx_apis::vulkan::{VulkanError, device::VulkanDevice, sampler::VulkanSampler}, arrayvec::ArrayVec, ash::vk::{ DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutCreateFlags, diff --git a/src/gfx_apis/vulkan/descriptor_buffer.rs b/src/gfx_apis/vulkan/descriptor_buffer.rs index 5efd96b3..4bdb18a9 100644 --- a/src/gfx_apis/vulkan/descriptor_buffer.rs +++ b/src/gfx_apis/vulkan/descriptor_buffer.rs @@ -1,10 +1,10 @@ use { crate::{ gfx_apis::vulkan::{ + VulkanError, allocator::{VulkanAllocation, VulkanAllocator}, descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, - VulkanError, }, utils::on_drop::OnDrop, }, diff --git a/src/gfx_apis/vulkan/device.rs b/src/gfx_apis/vulkan/device.rs index 5f7a6333..0bffca3c 100644 --- a/src/gfx_apis/vulkan/device.rs +++ b/src/gfx_apis/vulkan/device.rs @@ -2,22 +2,23 @@ use { crate::{ format::XRGB8888, gfx_apis::vulkan::{ + VulkanError, format::VulkanFormat, instance::{ - map_extension_properties, ApiVersionDisplay, Extensions, VulkanInstance, - API_VERSION, + API_VERSION, ApiVersionDisplay, Extensions, VulkanInstance, + map_extension_properties, }, - VulkanError, }, utils::on_drop::OnDrop, video::{ - drm::{sync_obj::SyncObjCtx, Drm}, + drm::{Drm, sync_obj::SyncObjCtx}, gbm::GbmDevice, }, }, ahash::AHashMap, arrayvec::ArrayVec, ash::{ + Device, ext::{ descriptor_buffer, external_memory_dma_buf, image_drm_format_modifier, physical_device_drm, queue_family_foreign, @@ -28,16 +29,16 @@ use { }, vk::{ DeviceCreateInfo, DeviceQueueCreateInfo, DeviceSize, ExternalSemaphoreFeatureFlags, - ExternalSemaphoreHandleTypeFlags, ExternalSemaphoreProperties, MemoryPropertyFlags, - MemoryType, PhysicalDevice, PhysicalDeviceBufferDeviceAddressFeatures, - PhysicalDeviceDescriptorBufferFeaturesEXT, PhysicalDeviceDescriptorBufferPropertiesEXT, - PhysicalDeviceDriverProperties, PhysicalDeviceDriverPropertiesKHR, - PhysicalDeviceDrmPropertiesEXT, PhysicalDeviceDynamicRenderingFeatures, - PhysicalDeviceExternalSemaphoreInfo, PhysicalDeviceProperties, - PhysicalDeviceProperties2, PhysicalDeviceSynchronization2Features, - PhysicalDeviceTimelineSemaphoreFeatures, Queue, QueueFlags, MAX_MEMORY_TYPES, + ExternalSemaphoreHandleTypeFlags, ExternalSemaphoreProperties, MAX_MEMORY_TYPES, + MemoryPropertyFlags, MemoryType, PhysicalDevice, + PhysicalDeviceBufferDeviceAddressFeatures, PhysicalDeviceDescriptorBufferFeaturesEXT, + PhysicalDeviceDescriptorBufferPropertiesEXT, PhysicalDeviceDriverProperties, + PhysicalDeviceDriverPropertiesKHR, PhysicalDeviceDrmPropertiesEXT, + PhysicalDeviceDynamicRenderingFeatures, PhysicalDeviceExternalSemaphoreInfo, + PhysicalDeviceProperties, PhysicalDeviceProperties2, + PhysicalDeviceSynchronization2Features, PhysicalDeviceTimelineSemaphoreFeatures, Queue, + QueueFlags, }, - Device, }, isnt::std_1::collections::IsntHashMap2Ext, std::{ diff --git a/src/gfx_apis/vulkan/fence.rs b/src/gfx_apis/vulkan/fence.rs index 3d833203..482c165a 100644 --- a/src/gfx_apis/vulkan/fence.rs +++ b/src/gfx_apis/vulkan/fence.rs @@ -1,7 +1,7 @@ use { crate::{ gfx_api::SyncFile, - gfx_apis::vulkan::{device::VulkanDevice, VulkanError}, + gfx_apis::vulkan::{VulkanError, device::VulkanDevice}, }, ash::vk::{ ExportFenceCreateInfo, ExternalFenceHandleTypeFlags, Fence, FenceCreateInfo, diff --git a/src/gfx_apis/vulkan/format.rs b/src/gfx_apis/vulkan/format.rs index e565ecab..73fca716 100644 --- a/src/gfx_apis/vulkan/format.rs +++ b/src/gfx_apis/vulkan/format.rs @@ -1,8 +1,8 @@ use { crate::{ - format::{Format, FORMATS}, - gfx_apis::vulkan::{instance::VulkanInstance, VulkanError}, - video::{Modifier, LINEAR_MODIFIER}, + format::{FORMATS, Format}, + gfx_apis::vulkan::{VulkanError, instance::VulkanInstance}, + video::{LINEAR_MODIFIER, Modifier}, }, ahash::AHashMap, ash::{ diff --git a/src/gfx_apis/vulkan/image.rs b/src/gfx_apis/vulkan/image.rs index 5fe04966..79292272 100644 --- a/src/gfx_apis/vulkan/image.rs +++ b/src/gfx_apis/vulkan/image.rs @@ -8,9 +8,9 @@ use { ShmGfxTexture, ShmMemory, SyncFile, }, gfx_apis::vulkan::{ - allocator::VulkanAllocation, device::VulkanDevice, format::VulkanModifierLimits, - renderer::VulkanRenderer, shm_image::VulkanShmImage, transfer::TransferType, - VulkanError, + VulkanError, allocator::VulkanAllocation, device::VulkanDevice, + format::VulkanModifierLimits, renderer::VulkanRenderer, shm_image::VulkanShmImage, + transfer::TransferType, }, rect::Region, theme::Color, diff --git a/src/gfx_apis/vulkan/instance.rs b/src/gfx_apis/vulkan/instance.rs index ddbe5dee..a88d4fa7 100644 --- a/src/gfx_apis/vulkan/instance.rs +++ b/src/gfx_apis/vulkan/instance.rs @@ -1,32 +1,32 @@ use { crate::{ - gfx_apis::vulkan::{VulkanError, VULKAN_VALIDATION}, + gfx_apis::vulkan::{VULKAN_VALIDATION, VulkanError}, utils::on_drop::OnDrop, }, ahash::{AHashMap, AHashSet}, ash::{ + Entry, Instance, LoadingError, ext::{debug_utils, validation_features}, vk::{ - api_version_major, api_version_minor, api_version_patch, api_version_variant, - ApplicationInfo, Bool32, DebugUtilsMessageSeverityFlagsEXT, + API_VERSION_1_3, ApplicationInfo, Bool32, DebugUtilsMessageSeverityFlagsEXT, DebugUtilsMessageTypeFlagsEXT, DebugUtilsMessengerCallbackDataEXT, - DebugUtilsMessengerCreateInfoEXT, DebugUtilsMessengerEXT, ExtensionProperties, - InstanceCreateInfo, LayerProperties, ValidationFeaturesEXT, API_VERSION_1_3, FALSE, + DebugUtilsMessengerCreateInfoEXT, DebugUtilsMessengerEXT, ExtensionProperties, FALSE, + InstanceCreateInfo, LayerProperties, ValidationFeaturesEXT, api_version_major, + api_version_minor, api_version_patch, api_version_variant, }, - Entry, Instance, LoadingError, }, isnt::std_1::collections::IsntHashMap2Ext, log::Level, once_cell::sync::Lazy, std::{ - ffi::{c_void, CStr, CString}, + ffi::{CStr, CString, c_void}, fmt::{Display, Formatter}, iter::IntoIterator, rc::Rc, slice, sync::Arc, }, - uapi::{ustr, Ustr}, + uapi::{Ustr, ustr}, }; pub struct VulkanInstance { diff --git a/src/gfx_apis/vulkan/pipeline.rs b/src/gfx_apis/vulkan/pipeline.rs index 1721485c..44e42dbd 100644 --- a/src/gfx_apis/vulkan/pipeline.rs +++ b/src/gfx_apis/vulkan/pipeline.rs @@ -1,8 +1,8 @@ use { crate::{ gfx_apis::vulkan::{ - descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, shaders::VulkanShader, - VulkanError, + VulkanError, descriptor::VulkanDescriptorSetLayout, device::VulkanDevice, + shaders::VulkanShader, }, utils::on_drop::OnDrop, }, diff --git a/src/gfx_apis/vulkan/renderer.rs b/src/gfx_apis/vulkan/renderer.rs index 75a7ddb2..1726d2e1 100644 --- a/src/gfx_apis/vulkan/renderer.rs +++ b/src/gfx_apis/vulkan/renderer.rs @@ -8,6 +8,7 @@ use { GfxWriteModifier, ReleaseSync, SyncFile, }, gfx_apis::vulkan::{ + VulkanError, allocator::{VulkanAllocator, VulkanThreadedAllocator}, command::{VulkanCommandBuffer, VulkanCommandPool}, descriptor::VulkanDescriptorSetLayout, @@ -21,10 +22,9 @@ use { sampler::VulkanSampler, semaphore::VulkanSemaphore, shaders::{ - FillPushConstants, TexPushConstants, VulkanShader, FILL_FRAG, FILL_VERT, TEX_FRAG, - TEX_VERT, + FILL_FRAG, FILL_VERT, FillPushConstants, TEX_FRAG, TEX_VERT, TexPushConstants, + VulkanShader, }, - VulkanError, }, io_uring::IoUring, rect::Region, @@ -33,26 +33,25 @@ use { copyhashmap::CopyHashMap, errorfmt::ErrorFmt, numcell::NumCell, once::Once, stack::Stack, }, - video::dmabuf::{dma_buf_export_sync_file, DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE}, + video::dmabuf::{DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE, dma_buf_export_sync_file}, }, ahash::AHashMap, ash::{ - vk, + Device, vk::{ - AccessFlags2, AttachmentLoadOp, AttachmentStoreOp, ClearAttachment, ClearColorValue, - ClearRect, ClearValue, CommandBuffer, CommandBufferBeginInfo, CommandBufferSubmitInfo, - CommandBufferUsageFlags, CopyImageInfo2, DependencyInfoKHR, + self, AccessFlags2, AttachmentLoadOp, AttachmentStoreOp, ClearAttachment, + ClearColorValue, ClearRect, ClearValue, CommandBuffer, CommandBufferBeginInfo, + CommandBufferSubmitInfo, CommandBufferUsageFlags, CopyImageInfo2, DependencyInfoKHR, DescriptorBufferBindingInfoEXT, DescriptorImageInfo, DescriptorType, DeviceSize, Extent2D, Extent3D, ImageAspectFlags, ImageCopy2, ImageLayout, ImageMemoryBarrier2, ImageSubresourceLayers, ImageSubresourceRange, Offset2D, Offset3D, PipelineBindPoint, - PipelineStageFlags2, Rect2D, RenderingAttachmentInfo, RenderingInfo, - SemaphoreSubmitInfo, SemaphoreSubmitInfoKHR, ShaderStageFlags, SubmitInfo2, Viewport, - WriteDescriptorSet, QUEUE_FAMILY_FOREIGN_EXT, + PipelineStageFlags2, QUEUE_FAMILY_FOREIGN_EXT, Rect2D, RenderingAttachmentInfo, + RenderingInfo, SemaphoreSubmitInfo, SemaphoreSubmitInfoKHR, ShaderStageFlags, + SubmitInfo2, Viewport, WriteDescriptorSet, }, - Device, }, isnt::std_1::collections::IsntHashMapExt, - linearize::{static_map, Linearize, StaticMap}, + linearize::{Linearize, StaticMap, static_map}, std::{ cell::{Cell, RefCell}, fmt::{Debug, Formatter}, diff --git a/src/gfx_apis/vulkan/sampler.rs b/src/gfx_apis/vulkan/sampler.rs index c7630da1..e1fe3a90 100644 --- a/src/gfx_apis/vulkan/sampler.rs +++ b/src/gfx_apis/vulkan/sampler.rs @@ -1,5 +1,5 @@ use { - crate::gfx_apis::vulkan::{device::VulkanDevice, VulkanError}, + crate::gfx_apis::vulkan::{VulkanError, device::VulkanDevice}, ash::vk::{ BorderColor, Filter, Sampler, SamplerAddressMode, SamplerCreateInfo, SamplerMipmapMode, }, diff --git a/src/gfx_apis/vulkan/semaphore.rs b/src/gfx_apis/vulkan/semaphore.rs index 71cfc9a7..067ad316 100644 --- a/src/gfx_apis/vulkan/semaphore.rs +++ b/src/gfx_apis/vulkan/semaphore.rs @@ -1,5 +1,5 @@ use { - crate::gfx_apis::vulkan::{device::VulkanDevice, VulkanError}, + crate::gfx_apis::vulkan::{VulkanError, device::VulkanDevice}, ash::vk::{ ExternalSemaphoreHandleTypeFlags, ImportSemaphoreFdInfoKHR, Semaphore, SemaphoreCreateInfo, SemaphoreImportFlags, diff --git a/src/gfx_apis/vulkan/shaders.rs b/src/gfx_apis/vulkan/shaders.rs index ff99f114..a17117fb 100644 --- a/src/gfx_apis/vulkan/shaders.rs +++ b/src/gfx_apis/vulkan/shaders.rs @@ -1,5 +1,5 @@ use { - crate::gfx_apis::vulkan::{device::VulkanDevice, VulkanError}, + crate::gfx_apis::vulkan::{VulkanError, device::VulkanDevice}, ash::vk::{ShaderModule, ShaderModuleCreateInfo}, std::rc::Rc, uapi::Packed, diff --git a/src/gfx_apis/vulkan/shm_image.rs b/src/gfx_apis/vulkan/shm_image.rs index 8b08a2a7..a03cef16 100644 --- a/src/gfx_apis/vulkan/shm_image.rs +++ b/src/gfx_apis/vulkan/shm_image.rs @@ -4,14 +4,14 @@ use { format::{Format, FormatShmInfo}, gfx_api::SyncFile, gfx_apis::vulkan::{ + VulkanError, allocator::VulkanAllocation, command::VulkanCommandBuffer, fence::VulkanFence, image::{QueueFamily, QueueState, VulkanImage, VulkanImageMemory}, - renderer::{image_barrier, VulkanRenderer}, + renderer::{VulkanRenderer, image_barrier}, staging::VulkanStagingBuffer, transfer::{TransferType, VulkanShmImageAsyncData}, - VulkanError, }, rect::Rect, utils::{errorfmt::ErrorFmt, on_drop::OnDrop}, diff --git a/src/gfx_apis/vulkan/staging.rs b/src/gfx_apis/vulkan/staging.rs index d168e64e..8a711b4d 100644 --- a/src/gfx_apis/vulkan/staging.rs +++ b/src/gfx_apis/vulkan/staging.rs @@ -3,10 +3,10 @@ use { cpu_worker::CpuWorker, gfx_api::GfxStagingBuffer, gfx_apis::vulkan::{ + VulkanError, allocator::{VulkanAllocation, VulkanAllocator}, device::VulkanDevice, renderer::VulkanRenderer, - VulkanError, }, utils::{ clonecell::CloneCell, @@ -14,8 +14,8 @@ use { }, }, ash::{ - vk::{Buffer, BufferCreateInfo, BufferUsageFlags}, Device, + vk::{Buffer, BufferCreateInfo, BufferUsageFlags}, }, gpu_alloc::UsageFlags, std::{any::Any, cell::Cell, rc::Rc}, diff --git a/src/gfx_apis/vulkan/transfer.rs b/src/gfx_apis/vulkan/transfer.rs index 61dd8cbd..3fbac290 100644 --- a/src/gfx_apis/vulkan/transfer.rs +++ b/src/gfx_apis/vulkan/transfer.rs @@ -1,23 +1,23 @@ use { crate::{ cpu_worker::{ + CpuJob, CpuWork, CpuWorker, jobs::{ img_copy::ImgCopyWork, read_write::{ReadWriteJobError, ReadWriteWork}, }, - CpuJob, CpuWork, CpuWorker, }, gfx_api::{ AsyncShmGfxTextureCallback, PendingShmTransfer, ShmMemory, ShmMemoryBacking, SyncFile, }, gfx_apis::vulkan::{ + VulkanError, command::VulkanCommandBuffer, fence::VulkanFence, image::{QueueFamily, QueueState, QueueTransfer, VulkanImage, VulkanImageMemory}, renderer::image_barrier, shm_image::VulkanShmImage, staging::{VulkanStagingBuffer, VulkanStagingShell}, - VulkanError, }, rect::{Rect, Region}, utils::{clonecell::CloneCell, errorfmt::ErrorFmt}, diff --git a/src/globals.rs b/src/globals.rs index 6ebd9733..f5310583 100644 --- a/src/globals.rs +++ b/src/globals.rs @@ -25,6 +25,7 @@ use { wl_output::WlOutputGlobal, wl_registry::WlRegistry, wl_seat::{ + WlSeatGlobal, ext_transient_seat_manager_v1::ExtTransientSeatManagerV1Global, tablet::zwp_tablet_manager_v2::ZwpTabletManagerV2Global, text_input::{ @@ -35,7 +36,6 @@ use { zwp_pointer_gestures_v1::ZwpPointerGesturesV1Global, zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1Global, zwp_virtual_keyboard_manager_v1::ZwpVirtualKeyboardManagerV1Global, - WlSeatGlobal, }, wl_shm::WlShmGlobal, wl_subcompositor::WlSubcompositorGlobal, diff --git a/src/ifs/ext_foreign_toplevel_handle_v1.rs b/src/ifs/ext_foreign_toplevel_handle_v1.rs index e5d90dbd..ad238be0 100644 --- a/src/ifs/ext_foreign_toplevel_handle_v1.rs +++ b/src/ifs/ext_foreign_toplevel_handle_v1.rs @@ -4,7 +4,7 @@ use { leaks::Tracker, object::{Object, Version}, tree::ToplevelOpt, - wire::{ext_foreign_toplevel_handle_v1::*, ExtForeignToplevelHandleV1Id}, + wire::{ExtForeignToplevelHandleV1Id, ext_foreign_toplevel_handle_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs b/src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs index 4ce2c6db..62529684 100644 --- a/src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs +++ b/src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs @@ -6,8 +6,8 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - ext_foreign_toplevel_image_capture_source_manager_v1::*, ExtForeignToplevelImageCaptureSourceManagerV1Id, + ext_foreign_toplevel_image_capture_source_manager_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ext_foreign_toplevel_list_v1.rs b/src/ifs/ext_foreign_toplevel_list_v1.rs index cc427eba..72b4a170 100644 --- a/src/ifs/ext_foreign_toplevel_list_v1.rs +++ b/src/ifs/ext_foreign_toplevel_list_v1.rs @@ -1,6 +1,6 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_FOREIGN_TOPLEVEL_LIST}, + client::{CAP_FOREIGN_TOPLEVEL_LIST, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::{ ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, @@ -10,8 +10,8 @@ use { object::{Object, Version}, tree::{NodeVisitorBase, ToplevelOpt}, wire::{ - ext_foreign_toplevel_list_v1::*, ExtForeignToplevelHandleV1Id, - ExtForeignToplevelListV1Id, + ExtForeignToplevelHandleV1Id, ExtForeignToplevelListV1Id, + ext_foreign_toplevel_list_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ext_idle_notification_v1.rs b/src/ifs/ext_idle_notification_v1.rs index 4ecd7b08..f0e74085 100644 --- a/src/ifs/ext_idle_notification_v1.rs +++ b/src/ifs/ext_idle_notification_v1.rs @@ -6,7 +6,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::asyncevent::AsyncEvent, - wire::{ext_idle_notification_v1::*, ExtIdleNotificationV1Id}, + wire::{ExtIdleNotificationV1Id, ext_idle_notification_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ext_idle_notifier_v1.rs b/src/ifs/ext_idle_notifier_v1.rs index 6df798f9..ea2fdfa7 100644 --- a/src/ifs/ext_idle_notifier_v1.rs +++ b/src/ifs/ext_idle_notifier_v1.rs @@ -1,12 +1,12 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_IDLE_NOTIFIER}, + client::{CAP_IDLE_NOTIFIER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::ext_idle_notification_v1::ExtIdleNotificationV1, leaks::Tracker, object::{Object, Version}, utils::errorfmt::ErrorFmt, - wire::{ext_idle_notifier_v1::*, ExtIdleNotificationV1Id, ExtIdleNotifierV1Id, WlSeatId}, + wire::{ExtIdleNotificationV1Id, ExtIdleNotifierV1Id, WlSeatId, ext_idle_notifier_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ext_image_capture_source_v1.rs b/src/ifs/ext_image_capture_source_v1.rs index 9f309257..66f3bf60 100644 --- a/src/ifs/ext_image_capture_source_v1.rs +++ b/src/ifs/ext_image_capture_source_v1.rs @@ -5,7 +5,7 @@ use { leaks::Tracker, object::{Object, Version}, tree::ToplevelOpt, - wire::{ext_image_capture_source_v1::*, ExtImageCaptureSourceV1Id}, + wire::{ExtImageCaptureSourceV1Id, ext_image_capture_source_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ext_image_copy/ext_image_copy_capture_cursor_session_v1.rs b/src/ifs/ext_image_copy/ext_image_copy_capture_cursor_session_v1.rs index 08695079..e81add08 100644 --- a/src/ifs/ext_image_copy/ext_image_copy_capture_cursor_session_v1.rs +++ b/src/ifs/ext_image_copy/ext_image_copy_capture_cursor_session_v1.rs @@ -7,7 +7,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{ext_image_copy_capture_cursor_session_v1::*, ExtImageCopyCaptureCursorSessionV1Id}, + wire::{ExtImageCopyCaptureCursorSessionV1Id, ext_image_copy_capture_cursor_session_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs b/src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs index 87a90318..3eb3f7af 100644 --- a/src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs +++ b/src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError}, gfx_api::{ AcquireSync, AsyncShmGfxTextureCallback, BufferResv, GfxError, GfxFramebuffer, - GfxTexture, ReleaseSync, SyncFile, STAGING_DOWNLOAD, + GfxTexture, ReleaseSync, STAGING_DOWNLOAD, SyncFile, }, ifs::{ ext_image_capture_source_v1::ImageCaptureSource, @@ -15,7 +15,7 @@ use { rect::Region, tree::{Node, OutputNode}, utils::{cell_ext::CellExt, errorfmt::ErrorFmt, transform_ext::TransformExt}, - wire::{ext_image_copy_capture_frame_v1::*, ExtImageCopyCaptureFrameV1Id}, + wire::{ExtImageCopyCaptureFrameV1Id, ext_image_copy_capture_frame_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs b/src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs index 914e920d..c2a219e1 100644 --- a/src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs +++ b/src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs @@ -1,6 +1,6 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_SCREENCOPY_MANAGER}, + client::{CAP_SCREENCOPY_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::{ ext_image_capture_source_v1::ImageCaptureSource, @@ -11,7 +11,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{ext_image_copy_capture_manager_v1::*, ExtImageCopyCaptureManagerV1Id}, + wire::{ExtImageCopyCaptureManagerV1Id, ext_image_copy_capture_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs b/src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs index 4dae7198..65f7dc34 100644 --- a/src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs +++ b/src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs @@ -1,7 +1,7 @@ use { crate::{ client::{Client, ClientError}, - format::{Format, FORMATS}, + format::{FORMATS, Format}, gfx_api::{ AcquireSync, BufferResv, GfxInternalFramebuffer, GfxStagingBuffer, GfxTexture, PendingShmTransfer, ReleaseSync, @@ -19,7 +19,7 @@ use { tree::{LatchListener, OutputNode, PresentationListener}, utils::{cell_ext::CellExt, clonecell::CloneCell, event_listener::EventListener}, video::Modifier, - wire::{ext_image_copy_capture_session_v1::*, ExtImageCopyCaptureSessionV1Id}, + wire::{ExtImageCopyCaptureSessionV1Id, ext_image_copy_capture_session_v1::*}, }, std::{ cell::Cell, diff --git a/src/ifs/ext_output_image_capture_source_manager_v1.rs b/src/ifs/ext_output_image_capture_source_manager_v1.rs index ad8763e6..643318dc 100644 --- a/src/ifs/ext_output_image_capture_source_manager_v1.rs +++ b/src/ifs/ext_output_image_capture_source_manager_v1.rs @@ -6,7 +6,7 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - ext_output_image_capture_source_manager_v1::*, ExtOutputImageCaptureSourceManagerV1Id, + ExtOutputImageCaptureSourceManagerV1Id, ext_output_image_capture_source_manager_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ext_session_lock_manager_v1.rs b/src/ifs/ext_session_lock_manager_v1.rs index 3d80fd17..3caaf183 100644 --- a/src/ifs/ext_session_lock_manager_v1.rs +++ b/src/ifs/ext_session_lock_manager_v1.rs @@ -1,11 +1,11 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_SESSION_LOCK_MANAGER}, + client::{CAP_SESSION_LOCK_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::ext_session_lock_v1::ExtSessionLockV1, leaks::Tracker, object::{Object, Version}, - wire::{ext_session_lock_manager_v1::*, ExtSessionLockManagerV1Id}, + wire::{ExtSessionLockManagerV1Id, ext_session_lock_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ext_session_lock_v1.rs b/src/ifs/ext_session_lock_v1.rs index cc08e3e2..f4dce7d4 100644 --- a/src/ifs/ext_session_lock_v1.rs +++ b/src/ifs/ext_session_lock_v1.rs @@ -6,7 +6,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{ext_session_lock_v1::*, ExtSessionLockV1Id}, + wire::{ExtSessionLockV1Id, ext_session_lock_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ipc/data_control/ext_data_control_device_v1.rs b/src/ifs/ipc/data_control/ext_data_control_device_v1.rs index b498fb6a..2765e45c 100644 --- a/src/ifs/ipc/data_control/ext_data_control_device_v1.rs +++ b/src/ifs/ipc/data_control/ext_data_control_device_v1.rs @@ -6,8 +6,8 @@ use { ext_data_control_offer_v1::ExtDataControlOfferV1, ext_data_control_source_v1::ExtDataControlSourceV1, private::{ - logic::{self, DataControlError}, DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData, + logic::{self, DataControlError}, }, }, wl_seat::WlSeatGlobal, @@ -15,8 +15,8 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - ext_data_control_device_v1::*, ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id, - ExtDataControlSourceV1Id, + ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id, ExtDataControlSourceV1Id, + ext_data_control_device_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs b/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs index 845d0d88..57678c46 100644 --- a/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs +++ b/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs @@ -1,17 +1,17 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER}, + client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::ipc::{ - data_control::{ - ext_data_control_device_v1::ExtDataControlDeviceV1, - ext_data_control_source_v1::ExtDataControlSourceV1, DynDataControlDevice, - }, IpcLocation, + data_control::{ + DynDataControlDevice, ext_data_control_device_v1::ExtDataControlDeviceV1, + ext_data_control_source_v1::ExtDataControlSourceV1, + }, }, leaks::Tracker, object::{Object, Version}, - wire::{ext_data_control_manager_v1::*, ExtDataControlManagerV1Id}, + wire::{ExtDataControlManagerV1Id, ext_data_control_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs b/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs index f401b227..66985730 100644 --- a/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs +++ b/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs @@ -3,13 +3,13 @@ use { ifs::ipc::data_control::{ ext_data_control_device_v1::ExtDataControlIpc, private::{ - logic::{self, DataControlError}, DataControlOffer, DataControlOfferData, + logic::{self, DataControlError}, }, }, leaks::Tracker, object::Object, - wire::{ext_data_control_offer_v1::*, ExtDataControlOfferV1Id}, + wire::{ExtDataControlOfferV1Id, ext_data_control_offer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/data_control/ext_data_control_source_v1.rs b/src/ifs/ipc/data_control/ext_data_control_source_v1.rs index fdc0ed1d..50ea99d5 100644 --- a/src/ifs/ipc/data_control/ext_data_control_source_v1.rs +++ b/src/ifs/ipc/data_control/ext_data_control_source_v1.rs @@ -2,18 +2,18 @@ use { crate::{ client::Client, ifs::ipc::{ + IpcLocation, SourceData, data_control::{ ext_data_control_device_v1::ExtDataControlIpc, private::{ - logic::{self, DataControlError}, DataControlSource, DataControlSourceData, + logic::{self, DataControlError}, }, }, - IpcLocation, SourceData, }, leaks::Tracker, object::{Object, Version}, - wire::{ext_data_control_source_v1::*, ExtDataControlSourceV1Id}, + wire::{ExtDataControlSourceV1Id, ext_data_control_source_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ipc/data_control/private.rs b/src/ifs/ipc/data_control/private.rs index 629765f7..bb5aeb47 100644 --- a/src/ifs/ipc/data_control/private.rs +++ b/src/ifs/ipc/data_control/private.rs @@ -3,12 +3,11 @@ use { client::{Client, ClientError, ClientId, WaylandObject, WaylandObjectLookup}, ifs::{ ipc::{ - cancel_offer, cancel_offers, + DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource, + IpcLocation, IpcVtable, OfferData, Role, SourceData, cancel_offer, cancel_offers, data_control::{DataControlDeviceId, DynDataControlDevice}, detach_seat, offer_source_to_data_control_device, offer_source_to_x, x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc}, - DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource, - IpcLocation, IpcVtable, OfferData, Role, SourceData, }, wl_seat::WlSeatGlobal, }, @@ -294,14 +293,14 @@ pub mod logic { client::ClientError, ifs::{ ipc::{ - add_data_source_mime_type, break_device_loops, break_offer_loops, + IpcLocation, add_data_source_mime_type, break_device_loops, break_offer_loops, break_source_loops, data_control::private::{ Clipboard, DataControlDevice, DataControlOffer, DataControlSource, PrimarySelection, Source, SourceId, }, destroy_data_device, destroy_data_offer, destroy_data_source, - receive_data_offer, IpcLocation, + receive_data_offer, }, wl_seat::WlSeatError, }, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs b/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs index 2c12aedf..f4683217 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs +++ b/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs @@ -4,8 +4,8 @@ use { ifs::{ ipc::data_control::{ private::{ - logic::{self, DataControlError}, DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData, + logic::{self, DataControlError}, }, zwlr_data_control_offer_v1::ZwlrDataControlOfferV1, zwlr_data_control_source_v1::ZwlrDataControlSourceV1, @@ -15,8 +15,8 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - zwlr_data_control_device_v1::*, ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, - ZwlrDataControlSourceV1Id, + ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, ZwlrDataControlSourceV1Id, + zwlr_data_control_device_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs b/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs index 8a43469a..2111000b 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs +++ b/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs @@ -1,17 +1,17 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER}, + client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::ipc::{ - data_control::{ - zwlr_data_control_device_v1::ZwlrDataControlDeviceV1, - zwlr_data_control_source_v1::ZwlrDataControlSourceV1, DynDataControlDevice, - }, IpcLocation, + data_control::{ + DynDataControlDevice, zwlr_data_control_device_v1::ZwlrDataControlDeviceV1, + zwlr_data_control_source_v1::ZwlrDataControlSourceV1, + }, }, leaks::Tracker, object::{Object, Version}, - wire::{zwlr_data_control_manager_v1::*, ZwlrDataControlManagerV1Id}, + wire::{ZwlrDataControlManagerV1Id, zwlr_data_control_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs b/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs index df9a61a8..f806576f 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs +++ b/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs @@ -2,14 +2,14 @@ use { crate::{ ifs::ipc::data_control::{ private::{ - logic::{self, DataControlError}, DataControlOffer, DataControlOfferData, + logic::{self, DataControlError}, }, zwlr_data_control_device_v1::WlrDataControlIpc, }, leaks::Tracker, object::Object, - wire::{zwlr_data_control_offer_v1::*, ZwlrDataControlOfferV1Id}, + wire::{ZwlrDataControlOfferV1Id, zwlr_data_control_offer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs b/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs index 2186bd9a..13beb7a9 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs +++ b/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs @@ -2,18 +2,18 @@ use { crate::{ client::Client, ifs::ipc::{ + IpcLocation, SourceData, data_control::{ private::{ - logic::{self, DataControlError}, DataControlSource, DataControlSourceData, + logic::{self, DataControlError}, }, zwlr_data_control_device_v1::WlrDataControlIpc, }, - IpcLocation, SourceData, }, leaks::Tracker, object::{Object, Version}, - wire::{zwlr_data_control_source_v1::*, ZwlrDataControlSourceV1Id}, + wire::{ZwlrDataControlSourceV1Id, zwlr_data_control_source_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/ipc/wl_data_device.rs b/src/ifs/ipc/wl_data_device.rs index 98b4de3c..67f75540 100644 --- a/src/ifs/ipc/wl_data_device.rs +++ b/src/ifs/ipc/wl_data_device.rs @@ -4,16 +4,15 @@ use { fixed::Fixed, ifs::{ ipc::{ - break_device_loops, destroy_data_device, wl_data_offer::WlDataOffer, - wl_data_source::WlDataSource, DeviceData, IpcVtable, IterableIpcVtable, OfferData, - Role, + DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops, + destroy_data_device, wl_data_offer::WlDataOffer, wl_data_source::WlDataSource, }, wl_seat::{WlSeatError, WlSeatGlobal}, wl_surface::WlSurfaceError, }, leaks::Tracker, object::{Object, Version}, - wire::{wl_data_device::*, WlDataDeviceId, WlDataOfferId, WlSurfaceId}, + wire::{WlDataDeviceId, WlDataOfferId, WlSurfaceId, wl_data_device::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/wl_data_device_manager.rs b/src/ifs/ipc/wl_data_device_manager.rs index 840e2546..2acefb2a 100644 --- a/src/ifs/ipc/wl_data_device_manager.rs +++ b/src/ifs/ipc/wl_data_device_manager.rs @@ -5,7 +5,7 @@ use { ifs::ipc::{wl_data_device::WlDataDevice, wl_data_source::WlDataSource}, leaks::Tracker, object::{Object, Version}, - wire::{wl_data_device_manager::*, WlDataDeviceManagerId}, + wire::{WlDataDeviceManagerId, wl_data_device_manager::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/wl_data_offer.rs b/src/ifs/ipc/wl_data_offer.rs index e422bafc..f45ebbc7 100644 --- a/src/ifs/ipc/wl_data_offer.rs +++ b/src/ifs/ipc/wl_data_offer.rs @@ -4,18 +4,18 @@ use { fixed::Fixed, ifs::{ ipc::{ - break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer, + DataOffer, DataOfferId, DynDataOffer, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, + OFFER_STATE_FINISHED, OfferData, Role, SOURCE_STATE_FINISHED, break_offer_loops, + cancel_offer, destroy_data_offer, receive_data_offer, wl_data_device::{ClipboardIpc, WlDataDevice}, wl_data_device_manager::DND_ALL, - DataOffer, DataOfferId, DynDataOffer, OfferData, Role, OFFER_STATE_ACCEPTED, - OFFER_STATE_DROPPED, OFFER_STATE_FINISHED, SOURCE_STATE_FINISHED, }, wl_seat::WlSeatGlobal, }, leaks::Tracker, object::Object, utils::bitflags::BitflagsExt, - wire::{wl_data_offer::*, WlDataOfferId, WlSurfaceId}, + wire::{WlDataOfferId, WlSurfaceId, wl_data_offer::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/wl_data_source.rs b/src/ifs/ipc/wl_data_source.rs index a7d0728a..0693527b 100644 --- a/src/ifs/ipc/wl_data_source.rs +++ b/src/ifs/ipc/wl_data_source.rs @@ -3,14 +3,13 @@ use { client::{Client, ClientError}, ifs::{ ipc::{ + DataSource, DynDataOffer, DynDataSource, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, + SOURCE_STATE_CANCELLED, SOURCE_STATE_DROPPED, SharedState, SourceData, add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source, detach_seat, offer_source_to_x, wl_data_device::ClipboardIpc, wl_data_device_manager::{DND_ALL, DND_NONE}, x_data_device::{XClipboardIpc, XIpcDevice}, - DataSource, DynDataOffer, DynDataSource, SharedState, SourceData, - OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, SOURCE_STATE_CANCELLED, - SOURCE_STATE_DROPPED, }, wl_seat::WlSeatGlobal, xdg_toplevel_drag_v1::XdgToplevelDragV1, @@ -18,7 +17,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::{bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell}, - wire::{wl_data_source::*, WlDataSourceId}, + wire::{WlDataSourceId, wl_data_source::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/x_data_device.rs b/src/ifs/ipc/x_data_device.rs index 6fb48591..4eeadc91 100644 --- a/src/ifs/ipc/x_data_device.rs +++ b/src/ifs/ipc/x_data_device.rs @@ -3,16 +3,16 @@ use { client::{Client, ClientError}, ifs::{ ipc::{ - x_data_offer::XDataOffer, x_data_source::XDataSource, DeviceData, IpcLocation, - IpcVtable, OfferData, Role, + DeviceData, IpcLocation, IpcVtable, OfferData, Role, x_data_offer::XDataOffer, + x_data_source::XDataSource, }, wl_seat::WlSeatGlobal, }, state::State, xwayland::XWaylandEvent, }, - std::rc::Rc, XWaylandEvent::IpcSetOffer, + std::rc::Rc, }; linear_ids!(XIpcDeviceIds, XIpcDeviceId, u64); diff --git a/src/ifs/ipc/x_data_offer.rs b/src/ifs/ipc/x_data_offer.rs index 4faaf4ef..d6449714 100644 --- a/src/ifs/ipc/x_data_offer.rs +++ b/src/ifs/ipc/x_data_offer.rs @@ -3,17 +3,16 @@ use { client::ClientId, ifs::{ ipc::{ - cancel_offer, + DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData, cancel_offer, x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc}, - DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData, }, wl_seat::WlSeatGlobal, }, leaks::Tracker, xwayland::XWaylandEvent, }, - std::rc::Rc, XWaylandEvent::IpcAddOfferMimeType, + std::rc::Rc, }; pub struct XDataOffer { diff --git a/src/ifs/ipc/x_data_source.rs b/src/ifs/ipc/x_data_source.rs index e7c03342..346d0462 100644 --- a/src/ifs/ipc/x_data_source.rs +++ b/src/ifs/ipc/x_data_source.rs @@ -2,8 +2,8 @@ use { crate::{ ifs::{ ipc::{ - cancel_offers, detach_seat, x_data_device::XIpcDevice, DataSource, DynDataSource, - IpcLocation, SourceData, + DataSource, DynDataSource, IpcLocation, SourceData, cancel_offers, detach_seat, + x_data_device::XIpcDevice, }, wl_seat::WlSeatGlobal, }, diff --git a/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs b/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs index 32eb80b0..9cee07d9 100644 --- a/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs +++ b/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs @@ -8,7 +8,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_primary_selection_device_manager_v1::*, ZwpPrimarySelectionDeviceManagerV1Id}, + wire::{ZwpPrimarySelectionDeviceManagerV1Id, zwp_primary_selection_device_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/zwp_primary_selection_device_v1.rs b/src/ifs/ipc/zwp_primary_selection_device_v1.rs index 63296837..d163b530 100644 --- a/src/ifs/ipc/zwp_primary_selection_device_v1.rs +++ b/src/ifs/ipc/zwp_primary_selection_device_v1.rs @@ -3,18 +3,17 @@ use { client::{Client, ClientError, ClientId}, ifs::{ ipc::{ - break_device_loops, destroy_data_device, - zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1, - zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, DeviceData, - IpcVtable, IterableIpcVtable, OfferData, Role, + DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops, + destroy_data_device, zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1, + zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, }, wl_seat::{WlSeatError, WlSeatGlobal}, }, leaks::Tracker, object::{Object, Version}, wire::{ - zwp_primary_selection_device_v1::*, ZwpPrimarySelectionDeviceV1Id, - ZwpPrimarySelectionOfferV1Id, + ZwpPrimarySelectionDeviceV1Id, ZwpPrimarySelectionOfferV1Id, + zwp_primary_selection_device_v1::*, }, }, std::rc::Rc, diff --git a/src/ifs/ipc/zwp_primary_selection_offer_v1.rs b/src/ifs/ipc/zwp_primary_selection_offer_v1.rs index e4a738b5..071b19f3 100644 --- a/src/ifs/ipc/zwp_primary_selection_offer_v1.rs +++ b/src/ifs/ipc/zwp_primary_selection_offer_v1.rs @@ -3,17 +3,17 @@ use { client::{Client, ClientError, ClientId}, ifs::{ ipc::{ - break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer, + DataOffer, DataOfferId, DynDataOffer, OfferData, break_offer_loops, cancel_offer, + destroy_data_offer, receive_data_offer, zwp_primary_selection_device_v1::{ PrimarySelectionIpc, ZwpPrimarySelectionDeviceV1, }, - DataOffer, DataOfferId, DynDataOffer, OfferData, }, wl_seat::WlSeatGlobal, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_primary_selection_offer_v1::*, ZwpPrimarySelectionOfferV1Id}, + wire::{ZwpPrimarySelectionOfferV1Id, zwp_primary_selection_offer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/ipc/zwp_primary_selection_source_v1.rs b/src/ifs/ipc/zwp_primary_selection_source_v1.rs index 27414003..26d10321 100644 --- a/src/ifs/ipc/zwp_primary_selection_source_v1.rs +++ b/src/ifs/ipc/zwp_primary_selection_source_v1.rs @@ -3,17 +3,17 @@ use { client::{Client, ClientError}, ifs::{ ipc::{ - add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source, - detach_seat, offer_source_to_x, + DataSource, DynDataSource, SourceData, add_data_source_mime_type, + break_source_loops, cancel_offers, destroy_data_source, detach_seat, + offer_source_to_x, x_data_device::{XIpcDevice, XPrimarySelectionIpc}, zwp_primary_selection_device_v1::PrimarySelectionIpc, - DataSource, DynDataSource, SourceData, }, wl_seat::WlSeatGlobal, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_primary_selection_source_v1::*, ZwpPrimarySelectionSourceV1Id}, + wire::{ZwpPrimarySelectionSourceV1Id, zwp_primary_selection_source_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_compositor.rs b/src/ifs/jay_compositor.rs index 89355f53..86893814 100644 --- a/src/ifs/jay_compositor.rs +++ b/src/ifs/jay_compositor.rs @@ -1,7 +1,7 @@ use { crate::{ cli::CliLogLevel, - client::{Client, ClientCaps, ClientError, CAP_JAY_COMPOSITOR}, + client::{CAP_JAY_COMPOSITOR, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::{ jay_ei_session_builder::JayEiSessionBuilder, @@ -24,7 +24,7 @@ use { object::{Object, Version}, screenshoter::take_screenshot, utils::{errorfmt::ErrorFmt, toplevel_identifier::ToplevelIdentifier}, - wire::{jay_compositor::*, JayCompositorId, JayScreenshotId}, + wire::{JayCompositorId, JayScreenshotId, jay_compositor::*}, }, bstr::ByteSlice, log::Level, diff --git a/src/ifs/jay_damage_tracking.rs b/src/ifs/jay_damage_tracking.rs index 10015f34..53f60429 100644 --- a/src/ifs/jay_damage_tracking.rs +++ b/src/ifs/jay_damage_tracking.rs @@ -1,16 +1,16 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_JAY_COMPOSITOR}, + client::{CAP_JAY_COMPOSITOR, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, leaks::Tracker, object::{Object, Version}, theme::Color, wire::{ + JayCompositorId, jay_damage_tracking::{ Destroy, JayDamageTrackingRequestHandler, SetVisualizerColor, SetVisualizerDecay, SetVisualizerEnabled, }, - JayCompositorId, }, }, std::{rc::Rc, time::Duration}, diff --git a/src/ifs/jay_ei_session.rs b/src/ifs/jay_ei_session.rs index 8aa516ca..0ba119ce 100644 --- a/src/ifs/jay_ei_session.rs +++ b/src/ifs/jay_ei_session.rs @@ -4,8 +4,8 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - jay_ei_session::{Created, Destroyed, Failed, JayEiSessionRequestHandler, Release}, JayEiSessionId, + jay_ei_session::{Created, Destroyed, Failed, JayEiSessionRequestHandler, Release}, }, }, std::rc::Rc, diff --git a/src/ifs/jay_ei_session_builder.rs b/src/ifs/jay_ei_session_builder.rs index e42b36fa..38b538c8 100644 --- a/src/ifs/jay_ei_session_builder.rs +++ b/src/ifs/jay_ei_session_builder.rs @@ -7,8 +7,8 @@ use { object::{Object, Version}, utils::{errorfmt::ErrorFmt, oserror::OsError}, wire::{ - jay_ei_session_builder::{Commit, JayEiSessionBuilderRequestHandler, SetAppId}, JayEiSessionBuilderId, + jay_ei_session_builder::{Commit, JayEiSessionBuilderRequestHandler, SetAppId}, }, }, std::{cell::RefCell, rc::Rc}, diff --git a/src/ifs/jay_idle.rs b/src/ifs/jay_idle.rs index 6078baf7..07e04b0c 100644 --- a/src/ifs/jay_idle.rs +++ b/src/ifs/jay_idle.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::zwp_idle_inhibitor_v1::ZwpIdleInhibitorV1, leaks::Tracker, object::{Object, Version}, - wire::{jay_idle::*, JayIdleId}, + wire::{JayIdleId, jay_idle::*}, }, std::{rc::Rc, time::Duration}, thiserror::Error, diff --git a/src/ifs/jay_input.rs b/src/ifs/jay_input.rs index 14291c90..8557df16 100644 --- a/src/ifs/jay_input.rs +++ b/src/ifs/jay_input.rs @@ -13,7 +13,7 @@ use { object::{Object, Version}, state::{DeviceHandlerData, InputDeviceData}, utils::errorfmt::ErrorFmt, - wire::{jay_input::*, JayInputId}, + wire::{JayInputId, jay_input::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_log_file.rs b/src/ifs/jay_log_file.rs index 72957ea6..4b5b450f 100644 --- a/src/ifs/jay_log_file.rs +++ b/src/ifs/jay_log_file.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError}, leaks::Tracker, object::{Object, Version}, - wire::{jay_log_file::*, JayLogFileId}, + wire::{JayLogFileId, jay_log_file::*}, }, bstr::BStr, std::rc::Rc, diff --git a/src/ifs/jay_output.rs b/src/ifs/jay_output.rs index e6532b73..0d8556f7 100644 --- a/src/ifs/jay_output.rs +++ b/src/ifs/jay_output.rs @@ -4,7 +4,7 @@ use { ifs::wl_output::OutputGlobalOpt, leaks::Tracker, object::{Object, Version}, - wire::{jay_output::*, JayOutputId}, + wire::{JayOutputId, jay_output::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_pointer.rs b/src/ifs/jay_pointer.rs index 1e8fdb86..2da29169 100644 --- a/src/ifs/jay_pointer.rs +++ b/src/ifs/jay_pointer.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::WlSeatGlobal, leaks::Tracker, object::{Object, Version}, - wire::{jay_pointer::*, JayPointerId}, + wire::{JayPointerId, jay_pointer::*}, }, num_traits::FromPrimitive, std::rc::Rc, diff --git a/src/ifs/jay_randr.rs b/src/ifs/jay_randr.rs index 042c28f5..2db096dd 100644 --- a/src/ifs/jay_randr.rs +++ b/src/ifs/jay_randr.rs @@ -10,7 +10,7 @@ use { state::{ConnectorData, DrmDevData, OutputData}, tree::{OutputNode, TearingMode, VrrMode}, utils::{gfx_api_ext::GfxApiExt, transform_ext::TransformExt}, - wire::{jay_randr::*, JayRandrId}, + wire::{JayRandrId, jay_randr::*}, }, jay_config::video::{ GfxApi, TearingMode as ConfigTearingMode, Transform, VrrMode as ConfigVrrMode, diff --git a/src/ifs/jay_render_ctx.rs b/src/ifs/jay_render_ctx.rs index 147c13fb..74b058e4 100644 --- a/src/ifs/jay_render_ctx.rs +++ b/src/ifs/jay_render_ctx.rs @@ -5,7 +5,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::errorfmt::ErrorFmt, - wire::{jay_render_ctx::*, JayRenderCtxId}, + wire::{JayRenderCtxId, jay_render_ctx::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_screencast.rs b/src/ifs/jay_screencast.rs index 67ecf5bf..a436ec68 100644 --- a/src/ifs/jay_screencast.rs +++ b/src/ifs/jay_screencast.rs @@ -1,6 +1,6 @@ use { crate::{ - allocator::{AllocatorError, BufferObject, BO_USE_LINEAR, BO_USE_RENDERING}, + allocator::{AllocatorError, BO_USE_LINEAR, BO_USE_RENDERING, BufferObject}, client::{Client, ClientError}, format::XRGB8888, gfx_api::{ @@ -19,8 +19,8 @@ use { numcell::NumCell, option_ext::OptionExt, }, - video::{dmabuf::DmaBuf, INVALID_MODIFIER, LINEAR_MODIFIER}, - wire::{jay_screencast::*, JayScreencastId}, + video::{INVALID_MODIFIER, LINEAR_MODIFIER, dmabuf::DmaBuf}, + wire::{JayScreencastId, jay_screencast::*}, }, ahash::AHashSet, jay_config::video::Transform, @@ -437,7 +437,7 @@ impl JayScreencast { } true => return Err(JayScreencastError::Modifier), false if format.write_modifiers.is_empty() => { - return Err(JayScreencastError::XRGB8888Writing) + return Err(JayScreencastError::XRGB8888Writing); } false => format.write_modifiers.keys().copied().collect(), }; diff --git a/src/ifs/jay_screenshot.rs b/src/ifs/jay_screenshot.rs index 05d1b150..d388fdd9 100644 --- a/src/ifs/jay_screenshot.rs +++ b/src/ifs/jay_screenshot.rs @@ -4,7 +4,7 @@ use { leaks::Tracker, object::{Object, Version}, video::dmabuf::{DmaBuf, DmaBufPlane}, - wire::{jay_screenshot::*, JayScreenshotId}, + wire::{JayScreenshotId, jay_screenshot::*}, }, std::{convert::Infallible, rc::Rc}, uapi::OwnedFd, diff --git a/src/ifs/jay_seat_events.rs b/src/ifs/jay_seat_events.rs index bd9f5c6e..d163b87a 100644 --- a/src/ifs/jay_seat_events.rs +++ b/src/ifs/jay_seat_events.rs @@ -4,16 +4,16 @@ use { client::Client, fixed::Fixed, ifs::wl_seat::{ + SeatId, tablet::{ PadButtonState, TabletRingEventSource, TabletStripEventSource, TabletTool, TabletToolChanges, TabletToolId, ToolButtonState, }, wl_pointer::PendingScroll, - SeatId, }, leaks::Tracker, object::{Object, Version}, - wire::{jay_seat_events::*, JaySeatEventsId}, + wire::{JaySeatEventsId, jay_seat_events::*}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/ifs/jay_select_toplevel.rs b/src/ifs/jay_select_toplevel.rs index 6eb83067..5fb9dec2 100644 --- a/src/ifs/jay_select_toplevel.rs +++ b/src/ifs/jay_select_toplevel.rs @@ -2,14 +2,14 @@ use { crate::{ client::{Client, ClientError}, ifs::{ - jay_toplevel::{JayToplevel, ID_SINCE}, + jay_toplevel::{ID_SINCE, JayToplevel}, wl_seat::ToplevelSelector, }, leaks::Tracker, object::{Object, Version}, tree::ToplevelNode, utils::clonecell::CloneCell, - wire::{jay_select_toplevel::*, JaySelectToplevelId, JayToplevelId}, + wire::{JaySelectToplevelId, JayToplevelId, jay_select_toplevel::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/jay_select_workspace.rs b/src/ifs/jay_select_workspace.rs index 475014e3..5b76f455 100644 --- a/src/ifs/jay_select_workspace.rs +++ b/src/ifs/jay_select_workspace.rs @@ -6,7 +6,7 @@ use { object::{Object, Version}, tree::WorkspaceNode, utils::clonecell::CloneCell, - wire::{jay_select_workspace::*, JaySelectWorkspaceId, JayWorkspaceId}, + wire::{JaySelectWorkspaceId, JayWorkspaceId, jay_select_workspace::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/jay_toplevel.rs b/src/ifs/jay_toplevel.rs index 30c83d3c..38048dc0 100644 --- a/src/ifs/jay_toplevel.rs +++ b/src/ifs/jay_toplevel.rs @@ -4,7 +4,7 @@ use { leaks::Tracker, object::{Object, Version}, tree::ToplevelNode, - wire::{jay_toplevel::*, JayToplevelId}, + wire::{JayToplevelId, jay_toplevel::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/jay_tray_v1.rs b/src/ifs/jay_tray_v1.rs index cc36d3ec..712eb130 100644 --- a/src/ifs/jay_tray_v1.rs +++ b/src/ifs/jay_tray_v1.rs @@ -8,7 +8,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{jay_tray_v1::*, JayTrayV1Id}, + wire::{JayTrayV1Id, jay_tray_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_workspace.rs b/src/ifs/jay_workspace.rs index f9a40eb4..96cc3035 100644 --- a/src/ifs/jay_workspace.rs +++ b/src/ifs/jay_workspace.rs @@ -5,7 +5,7 @@ use { object::{Object, Version}, tree::{OutputNode, WorkspaceNode}, utils::clonecell::CloneCell, - wire::{jay_workspace::*, JayWorkspaceId}, + wire::{JayWorkspaceId, jay_workspace::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_workspace_watcher.rs b/src/ifs/jay_workspace_watcher.rs index 902da994..9f9f4798 100644 --- a/src/ifs/jay_workspace_watcher.rs +++ b/src/ifs/jay_workspace_watcher.rs @@ -6,7 +6,7 @@ use { object::{Object, Version}, tree::WorkspaceNode, utils::clonecell::CloneCell, - wire::{jay_workspace_watcher::*, JayWorkspaceWatcherId}, + wire::{JayWorkspaceWatcherId, jay_workspace_watcher::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/jay_xwayland.rs b/src/ifs/jay_xwayland.rs index 709a7d4a..05399fcf 100644 --- a/src/ifs/jay_xwayland.rs +++ b/src/ifs/jay_xwayland.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError}, leaks::Tracker, object::{Object, Version}, - wire::{jay_xwayland::*, JayXwaylandId}, + wire::{JayXwaylandId, jay_xwayland::*}, }, jay_config::xwayland::XScalingMode, std::rc::Rc, diff --git a/src/ifs/org_kde_kwin_server_decoration.rs b/src/ifs/org_kde_kwin_server_decoration.rs index cb5459c8..bc58d2f9 100644 --- a/src/ifs/org_kde_kwin_server_decoration.rs +++ b/src/ifs/org_kde_kwin_server_decoration.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError}, leaks::Tracker, object::{Object, Version}, - wire::{org_kde_kwin_server_decoration::*, OrgKdeKwinServerDecorationId}, + wire::{OrgKdeKwinServerDecorationId, org_kde_kwin_server_decoration::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/org_kde_kwin_server_decoration_manager.rs b/src/ifs/org_kde_kwin_server_decoration_manager.rs index 733bd95f..3f829e24 100644 --- a/src/ifs/org_kde_kwin_server_decoration_manager.rs +++ b/src/ifs/org_kde_kwin_server_decoration_manager.rs @@ -7,7 +7,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{org_kde_kwin_server_decoration_manager::*, OrgKdeKwinServerDecorationManagerId}, + wire::{OrgKdeKwinServerDecorationManagerId, org_kde_kwin_server_decoration_manager::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_buffer.rs b/src/ifs/wl_buffer.rs index d60de1c9..d42aff1d 100644 --- a/src/ifs/wl_buffer.rs +++ b/src/ifs/wl_buffer.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, clientmem::{ClientMem, ClientMemError, ClientMemOffset}, - format::{Format, ARGB8888}, + format::{ARGB8888, Format}, gfx_api::{GfxError, GfxFramebuffer, GfxImage, GfxTexture}, ifs::wl_surface::WlSurface, leaks::Tracker, @@ -11,7 +11,7 @@ use { theme::Color, utils::errorfmt::ErrorFmt, video::dmabuf::DmaBuf, - wire::{wl_buffer::*, WlBufferId}, + wire::{WlBufferId, wl_buffer::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/ifs/wl_callback.rs b/src/ifs/wl_callback.rs index f6b78d33..8bdfa948 100644 --- a/src/ifs/wl_callback.rs +++ b/src/ifs/wl_callback.rs @@ -3,7 +3,7 @@ use { client::Client, leaks::Tracker, object::{Object, Version}, - wire::{wl_callback::*, WlCallbackId}, + wire::{WlCallbackId, wl_callback::*}, }, std::{convert::Infallible, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_compositor.rs b/src/ifs/wl_compositor.rs index 4d0a1ebc..439f45db 100644 --- a/src/ifs/wl_compositor.rs +++ b/src/ifs/wl_compositor.rs @@ -5,7 +5,7 @@ use { ifs::{wl_region::WlRegion, wl_surface::WlSurface}, leaks::Tracker, object::{Object, Version}, - wire::{wl_compositor::*, WlCompositorId}, + wire::{WlCompositorId, wl_compositor::*}, xwayland::XWaylandEvent, }, std::rc::Rc, diff --git a/src/ifs/wl_display.rs b/src/ifs/wl_display.rs index 83cc70a3..f8718955 100644 --- a/src/ifs/wl_display.rs +++ b/src/ifs/wl_display.rs @@ -4,7 +4,7 @@ use { ifs::{wl_callback::WlCallback, wl_registry::WlRegistry}, leaks::Tracker, object::{Object, ObjectId, Version, WL_DISPLAY_ID}, - wire::{wl_display::*, WlDisplayId}, + wire::{WlDisplayId, wl_display::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_drm.rs b/src/ifs/wl_drm.rs index 212ad660..9249bbf0 100644 --- a/src/ifs/wl_drm.rs +++ b/src/ifs/wl_drm.rs @@ -7,10 +7,10 @@ use { leaks::Tracker, object::{Object, Version}, video::{ - dmabuf::{DmaBuf, DmaBufPlane, PlaneVec}, INVALID_MODIFIER, + dmabuf::{DmaBuf, DmaBufPlane, PlaneVec}, }, - wire::{wl_drm::*, WlDrmId}, + wire::{WlDrmId, wl_drm::*}, }, bstr::ByteSlice, std::{ffi::CString, rc::Rc}, diff --git a/src/ifs/wl_fixes.rs b/src/ifs/wl_fixes.rs index 22ed4f1c..ac32e3dc 100644 --- a/src/ifs/wl_fixes.rs +++ b/src/ifs/wl_fixes.rs @@ -4,7 +4,7 @@ use { globals::{Global, GlobalName}, leaks::Tracker, object::{Object, Version}, - wire::{wl_fixes::*, WlFixesId}, + wire::{WlFixesId, wl_fixes::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_output.rs b/src/ifs/wl_output.rs index ec56fa92..c1cc82f5 100644 --- a/src/ifs/wl_output.rs +++ b/src/ifs/wl_output.rs @@ -12,12 +12,12 @@ use { object::{Object, Version}, rect::Rect, state::{ConnectorData, State}, - tree::{calculate_logical_size, OutputNode, TearingMode, VrrMode}, + tree::{OutputNode, TearingMode, VrrMode, calculate_logical_size}, utils::{ cell_ext::CellExt, clonecell::CloneCell, copyhashmap::CopyHashMap, rc_eq::rc_eq, transform_ext::TransformExt, }, - wire::{wl_output::*, WlOutputId, ZxdgOutputV1Id}, + wire::{WlOutputId, ZxdgOutputV1Id, wl_output::*}, }, ahash::AHashMap, jay_config::video::Transform, diff --git a/src/ifs/wl_output/removed_output.rs b/src/ifs/wl_output/removed_output.rs index 598335e9..0741c3ed 100644 --- a/src/ifs/wl_output/removed_output.rs +++ b/src/ifs/wl_output/removed_output.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, globals::{Global, GlobalName, RemovableWaylandGlobal}, - ifs::wl_output::{WlOutput, WlOutputGlobal, OUTPUT_VERSION}, + ifs::wl_output::{OUTPUT_VERSION, WlOutput, WlOutputGlobal}, object::Version, wire::WlOutputId, }, diff --git a/src/ifs/wl_region.rs b/src/ifs/wl_region.rs index 47e054c9..3331b78a 100644 --- a/src/ifs/wl_region.rs +++ b/src/ifs/wl_region.rs @@ -4,7 +4,7 @@ use { leaks::Tracker, object::{Object, Version}, rect::{Rect, Region, RegionBuilder}, - wire::{wl_region::*, WlRegionId}, + wire::{WlRegionId, wl_region::*}, }, std::{cell::RefCell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_registry.rs b/src/ifs/wl_registry.rs index 9392043e..ef98d0de 100644 --- a/src/ifs/wl_registry.rs +++ b/src/ifs/wl_registry.rs @@ -4,7 +4,7 @@ use { globals::{Global, GlobalName, GlobalsError}, leaks::Tracker, object::{Interface, Object, Version}, - wire::{wl_registry::*, WlRegistryId}, + wire::{WlRegistryId, wl_registry::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs index 459dcbf1..2b9c2b55 100644 --- a/src/ifs/wl_seat.rs +++ b/src/ifs/wl_seat.rs @@ -32,7 +32,7 @@ use { ifs::{ ext_idle_notification_v1::ExtIdleNotificationV1, ipc::{ - self, + self, DynDataSource, IpcError, IpcLocation, data_control::{DataControlDeviceId, DynDataControlDevice}, offer_source_to_regular_client, wl_data_device::{ClipboardIpc, WlDataDevice}, @@ -42,7 +42,6 @@ use { PrimarySelectionIpc, ZwpPrimarySelectionDeviceV1, }, zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, - DynDataSource, IpcError, IpcLocation, }, wl_output::WlOutputGlobal, wl_seat::{ @@ -55,7 +54,7 @@ use { zwp_input_method_v2::ZwpInputMethodV2, zwp_text_input_v3::ZwpTextInputV3, }, touch_owner::TouchOwnerHolder, - wl_keyboard::{WlKeyboard, WlKeyboardError, REPEAT_INFO_SINCE}, + wl_keyboard::{REPEAT_INFO_SINCE, WlKeyboard, WlKeyboardError}, wl_pointer::WlPointer, wl_touch::WlTouch, zwp_pointer_constraints_v1::{SeatConstraint, SeatConstraintStatus}, @@ -65,10 +64,10 @@ use { zwp_relative_pointer_v1::ZwpRelativePointerV1, }, wl_surface::{ + WlSurface, dnd_icon::DndIcon, tray::{DynTrayItem, TrayItemId}, xdg_surface::xdg_popup::XdgPopup, - WlSurface, }, xdg_toplevel_drag_v1::XdgToplevelDragV1, }, @@ -79,8 +78,8 @@ use { rect::Rect, state::{DeviceHandlerData, State}, tree::{ - generic_node_visitor, ContainerNode, ContainerSplit, Direction, FoundNode, Node, - OutputNode, ToplevelNode, WorkspaceNode, + ContainerNode, ContainerSplit, Direction, FoundNode, Node, OutputNode, ToplevelNode, + WorkspaceNode, generic_node_visitor, }, utils::{ asyncevent::AsyncEvent, bindings::PerClientBindings, clonecell::CloneCell, @@ -88,9 +87,9 @@ use { smallmap::SmallMap, }, wire::{ - wl_seat::*, ExtIdleNotificationV1Id, WlDataDeviceId, WlKeyboardId, WlPointerId, - WlSeatId, WlTouchId, XdgPopupId, ZwpPrimarySelectionDeviceV1Id, ZwpRelativePointerV1Id, - ZwpTextInputV3Id, + ExtIdleNotificationV1Id, WlDataDeviceId, WlKeyboardId, WlPointerId, WlSeatId, + WlTouchId, XdgPopupId, ZwpPrimarySelectionDeviceV1Id, ZwpRelativePointerV1Id, + ZwpTextInputV3Id, wl_seat::*, }, wire_ei::EiSeatId, }, diff --git a/src/ifs/wl_seat/event_handling.rs b/src/ifs/wl_seat/event_handling.rs index 29226d85..ce1a9532 100644 --- a/src/ifs/wl_seat/event_handling.rs +++ b/src/ifs/wl_seat/event_handling.rs @@ -1,7 +1,7 @@ use { crate::{ backend::{ - AxisSource, ConnectorId, InputDeviceId, InputEvent, KeyState, ScrollAxis, AXIS_120, + AXIS_120, AxisSource, ConnectorId, InputDeviceId, InputEvent, KeyState, ScrollAxis, }, client::ClientId, config::InvokedShortcut, @@ -17,21 +17,21 @@ use { }, }, wl_seat::{ + CHANGE_CURSOR_MOVED, CHANGE_TREE, Dnd, SeatId, WlSeat, WlSeatGlobal, tablet::{TabletPad, TabletPadId, TabletTool, TabletToolId}, text_input::TextDisconnectReason, wl_keyboard::WlKeyboard, wl_pointer::{ - self, PendingScroll, WlPointer, AXIS_DISCRETE_SINCE_VERSION, - AXIS_RELATIVE_DIRECTION_SINCE_VERSION, AXIS_SOURCE_SINCE_VERSION, - AXIS_STOP_SINCE_VERSION, AXIS_VALUE120_SINCE_VERSION, IDENTICAL, INVERTED, - POINTER_FRAME_SINCE_VERSION, WHEEL_TILT, WHEEL_TILT_SINCE_VERSION, + self, AXIS_DISCRETE_SINCE_VERSION, AXIS_RELATIVE_DIRECTION_SINCE_VERSION, + AXIS_SOURCE_SINCE_VERSION, AXIS_STOP_SINCE_VERSION, + AXIS_VALUE120_SINCE_VERSION, IDENTICAL, INVERTED, POINTER_FRAME_SINCE_VERSION, + PendingScroll, WHEEL_TILT, WHEEL_TILT_SINCE_VERSION, WlPointer, }, wl_touch::WlTouch, zwp_pointer_constraints_v1::{ConstraintType, SeatConstraintStatus}, zwp_relative_pointer_v1::ZwpRelativePointerV1, - Dnd, SeatId, WlSeat, WlSeatGlobal, CHANGE_CURSOR_MOVED, CHANGE_TREE, }, - wl_surface::{xdg_surface::xdg_popup::XdgPopup, WlSurface}, + wl_surface::{WlSurface, xdg_surface::xdg_popup::XdgPopup}, }, kbvm::KbvmState, keyboard::KeyboardState, @@ -49,11 +49,11 @@ use { jay_config::{ input::SwitchEvent, keyboard::{ - mods::{Modifiers, CAPS, NUM, RELEASE}, + mods::{CAPS, Modifiers, NUM, RELEASE}, syms::{KeySym, SYM_Escape}, }, }, - kbvm::{state_machine::Event, ModifierMask}, + kbvm::{ModifierMask, state_machine::Event}, smallvec::SmallVec, std::{cell::RefCell, collections::hash_map::Entry, mem, rc::Rc}, }; diff --git a/src/ifs/wl_seat/ext_transient_seat_manager_v1.rs b/src/ifs/wl_seat/ext_transient_seat_manager_v1.rs index 8cbe6edd..aae26a1c 100644 --- a/src/ifs/wl_seat/ext_transient_seat_manager_v1.rs +++ b/src/ifs/wl_seat/ext_transient_seat_manager_v1.rs @@ -1,11 +1,11 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_SEAT_MANAGER}, + client::{CAP_SEAT_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::wl_seat::ext_transient_seat_v1::ExtTransientSeatV1, leaks::Tracker, object::{Object, Version}, - wire::{ext_transient_seat_manager_v1::*, ExtTransientSeatManagerV1Id}, + wire::{ExtTransientSeatManagerV1Id, ext_transient_seat_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/ext_transient_seat_v1.rs b/src/ifs/wl_seat/ext_transient_seat_v1.rs index 23bd55c8..497236fc 100644 --- a/src/ifs/wl_seat/ext_transient_seat_v1.rs +++ b/src/ifs/wl_seat/ext_transient_seat_v1.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError}, leaks::Tracker, object::{Object, Version}, - wire::{ext_transient_seat_v1::*, ExtTransientSeatV1Id}, + wire::{ExtTransientSeatV1Id, ext_transient_seat_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/pointer_owner.rs b/src/ifs/wl_seat/pointer_owner.rs index 6d61eedf..5e5c6d01 100644 --- a/src/ifs/wl_seat/pointer_owner.rs +++ b/src/ifs/wl_seat/pointer_owner.rs @@ -1,23 +1,23 @@ use { crate::{ - backend::{AxisSource, KeyState, ScrollAxis, AXIS_120}, + backend::{AXIS_120, AxisSource, KeyState, ScrollAxis}, cursor::KnownCursor, fixed::Fixed, ifs::{ ipc, ipc::wl_data_source::WlDataSource, wl_seat::{ - wl_pointer::PendingScroll, Dnd, DroppedDnd, NodeSeatState, WlSeatError, - WlSeatGlobal, BTN_LEFT, BTN_RIGHT, CHANGE_CURSOR_MOVED, CHANGE_TREE, + BTN_LEFT, BTN_RIGHT, CHANGE_CURSOR_MOVED, CHANGE_TREE, Dnd, DroppedDnd, + NodeSeatState, WlSeatError, WlSeatGlobal, wl_pointer::PendingScroll, }, - wl_surface::{dnd_icon::DndIcon, WlSurface}, + wl_surface::{WlSurface, dnd_icon::DndIcon}, xdg_toplevel_drag_v1::XdgToplevelDragV1, }, rect::Rect, tree::{ - move_ws_to_output, ContainerNode, ContainerSplit, ContainingNode, FindTreeUsecase, - FoundNode, Node, PlaceholderNode, TddType, ToplevelNode, WorkspaceDragDestination, - WorkspaceNode, WsMoveConfig, + ContainerNode, ContainerSplit, ContainingNode, FindTreeUsecase, FoundNode, Node, + PlaceholderNode, TddType, ToplevelNode, WorkspaceDragDestination, WorkspaceNode, + WsMoveConfig, move_ws_to_output, }, utils::{clonecell::CloneCell, smallmap::SmallMap}, }, diff --git a/src/ifs/wl_seat/tablet.rs b/src/ifs/wl_seat/tablet.rs index 4aa9db6d..9fa2c277 100644 --- a/src/ifs/wl_seat/tablet.rs +++ b/src/ifs/wl_seat/tablet.rs @@ -4,6 +4,7 @@ use { cursor_user::CursorUser, ifs::{ wl_seat::{ + WlSeatGlobal, tablet::{ pad_owner::PadOwnerHolder, tablet_bindings::TabletBindings, tool_owner::ToolOwnerHolder, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, @@ -12,7 +13,6 @@ use { zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2, }, - WlSeatGlobal, }, wl_surface::WlSurface, }, diff --git a/src/ifs/wl_seat/tablet/pad.rs b/src/ifs/wl_seat/tablet/pad.rs index 83b6c54a..749146c6 100644 --- a/src/ifs/wl_seat/tablet/pad.rs +++ b/src/ifs/wl_seat/tablet/pad.rs @@ -4,12 +4,12 @@ use { fixed::Fixed, ifs::{ wl_seat::{ + WlSeatGlobal, tablet::{ - normalizeu, zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_v2::ZwpTabletV2, PadButtonState, TabletPad, TabletPadGroup, TabletPadId, TabletPadInit, TabletPadRing, TabletPadStrip, TabletRingEventSource, TabletStripEventSource, + normalizeu, zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_v2::ZwpTabletV2, }, - WlSeatGlobal, }, wl_surface::WlSurface, }, diff --git a/src/ifs/wl_seat/tablet/tool.rs b/src/ifs/wl_seat/tablet/tool.rs index 6f6a8326..5c60104e 100644 --- a/src/ifs/wl_seat/tablet/tool.rs +++ b/src/ifs/wl_seat/tablet/tool.rs @@ -4,12 +4,12 @@ use { fixed::Fixed, ifs::{ wl_seat::{ - tablet::{ - normalizei, normalizeu, zwp_tablet_tool_v2::ZwpTabletToolV2, - zwp_tablet_v2::ZwpTabletV2, TabletTool, TabletToolChanges, TabletToolId, - TabletToolInit, TabletToolOpt, TabletToolType, ToolButtonState, - }, WlSeatGlobal, + tablet::{ + TabletTool, TabletToolChanges, TabletToolId, TabletToolInit, TabletToolOpt, + TabletToolType, ToolButtonState, normalizei, normalizeu, + zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2, + }, }, wl_surface::WlSurface, }, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs index 982f80e7..42c33b8d 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::tablet::zwp_tablet_seat_v2::ZwpTabletSeatV2, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_manager_v2::*, ZwpTabletManagerV2Id}, + wire::{ZwpTabletManagerV2Id, zwp_tablet_manager_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_pad_group_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_pad_group_v2.rs index 1ab8a91a..f992b810 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_pad_group_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_pad_group_v2.rs @@ -2,13 +2,12 @@ use { crate::{ client::{Client, ClientError}, ifs::wl_seat::tablet::{ - zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2, + TabletPadGroup, zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2, zwp_tablet_pad_strip_v2::ZwpTabletPadStripV2, zwp_tablet_seat_v2::ZwpTabletSeatV2, - TabletPadGroup, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_pad_group_v2::*, ZwpTabletPadGroupV2Id}, + wire::{ZwpTabletPadGroupV2Id, zwp_tablet_pad_group_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_pad_ring_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_pad_ring_v2.rs index 180e0197..4cf2f4ad 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_pad_ring_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_pad_ring_v2.rs @@ -3,11 +3,11 @@ use { client::{Client, ClientError}, fixed::Fixed, ifs::wl_seat::tablet::{ - zwp_tablet_seat_v2::ZwpTabletSeatV2, TabletPadRing, TabletRingEventSource, + TabletPadRing, TabletRingEventSource, zwp_tablet_seat_v2::ZwpTabletSeatV2, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_pad_ring_v2::*, ZwpTabletPadRingV2Id}, + wire::{ZwpTabletPadRingV2Id, zwp_tablet_pad_ring_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_pad_strip_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_pad_strip_v2.rs index ae0e8861..e5b416ed 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_pad_strip_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_pad_strip_v2.rs @@ -2,11 +2,11 @@ use { crate::{ client::{Client, ClientError}, ifs::wl_seat::tablet::{ - zwp_tablet_seat_v2::ZwpTabletSeatV2, TabletPadStrip, TabletStripEventSource, + TabletPadStrip, TabletStripEventSource, zwp_tablet_seat_v2::ZwpTabletSeatV2, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_pad_strip_v2::*, ZwpTabletPadStripV2Id}, + wire::{ZwpTabletPadStripV2Id, zwp_tablet_pad_strip_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs index d7801e43..fb7d5be6 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs @@ -3,14 +3,14 @@ use { client::{Client, ClientError}, ifs::{ wl_seat::tablet::{ - zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, zwp_tablet_seat_v2::ZwpTabletSeatV2, - zwp_tablet_v2::ZwpTabletV2, PadButtonState, TabletPad, + PadButtonState, TabletPad, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, + zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2, }, wl_surface::WlSurface, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_pad_v2::*, ZwpTabletPadV2Id}, + wire::{ZwpTabletPadV2Id, zwp_tablet_pad_v2::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs index 14c80ea9..9be60e55 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs @@ -2,18 +2,17 @@ use { crate::{ client::{Client, ClientError}, ifs::wl_seat::{ + WlSeatGlobal, tablet::{ - zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, + Tablet, TabletPad, TabletTool, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2, zwp_tablet_pad_strip_v2::ZwpTabletPadStripV2, zwp_tablet_pad_v2::ZwpTabletPadV2, - zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2, Tablet, TabletPad, - TabletTool, + zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2, }, - WlSeatGlobal, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_seat_v2::*, ZwpTabletSeatV2Id}, + wire::{ZwpTabletSeatV2Id, zwp_tablet_seat_v2::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs index a78ad514..28aec218 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs @@ -5,14 +5,14 @@ use { fixed::Fixed, ifs::{ wl_seat::tablet::{ - zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2, TabletToolCapability, TabletToolOpt, TabletToolType, ToolButtonState, + zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2, }, wl_surface::{WlSurface, WlSurfaceError}, }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_tool_v2::*, ZwpTabletToolV2Id}, + wire::{ZwpTabletToolV2Id, zwp_tablet_tool_v2::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/tablet/zwp_tablet_v2.rs b/src/ifs/wl_seat/tablet/zwp_tablet_v2.rs index 4a2157b5..a5a90158 100644 --- a/src/ifs/wl_seat/tablet/zwp_tablet_v2.rs +++ b/src/ifs/wl_seat/tablet/zwp_tablet_v2.rs @@ -1,10 +1,10 @@ use { crate::{ client::{Client, ClientError}, - ifs::wl_seat::tablet::{zwp_tablet_seat_v2::ZwpTabletSeatV2, Tablet}, + ifs::wl_seat::tablet::{Tablet, zwp_tablet_seat_v2::ZwpTabletSeatV2}, leaks::Tracker, object::{Object, Version}, - wire::{zwp_tablet_v2::*, ZwpTabletV2Id}, + wire::{ZwpTabletV2Id, zwp_tablet_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/text_input.rs b/src/ifs/wl_seat/text_input.rs index 44154554..4f4f8418 100644 --- a/src/ifs/wl_seat/text_input.rs +++ b/src/ifs/wl_seat/text_input.rs @@ -1,10 +1,10 @@ use { crate::ifs::{ wl_seat::{ + WlSeatGlobal, text_input::{ zwp_input_method_v2::ZwpInputMethodV2, zwp_text_input_v3::ZwpTextInputV3, }, - WlSeatGlobal, }, wl_surface::WlSurface, }, diff --git a/src/ifs/wl_seat/text_input/zwp_input_method_keyboard_grab_v2.rs b/src/ifs/wl_seat/text_input/zwp_input_method_keyboard_grab_v2.rs index f8e826fa..32b05da1 100644 --- a/src/ifs/wl_seat/text_input/zwp_input_method_keyboard_grab_v2.rs +++ b/src/ifs/wl_seat/text_input/zwp_input_method_keyboard_grab_v2.rs @@ -7,7 +7,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::errorfmt::ErrorFmt, - wire::{zwp_input_method_keyboard_grab_v2::*, ZwpInputMethodKeyboardGrabV2Id}, + wire::{ZwpInputMethodKeyboardGrabV2Id, zwp_input_method_keyboard_grab_v2::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs b/src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs index 4dccf2b5..d78dbc7b 100644 --- a/src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs +++ b/src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs @@ -1,11 +1,11 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_INPUT_METHOD}, + client::{CAP_INPUT_METHOD, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, - ifs::wl_seat::text_input::{zwp_input_method_v2::ZwpInputMethodV2, TextConnectReason}, + ifs::wl_seat::text_input::{TextConnectReason, zwp_input_method_v2::ZwpInputMethodV2}, leaks::Tracker, object::{Object, Version}, - wire::{zwp_input_method_manager_v2::*, ZwpInputMethodManagerV2Id}, + wire::{ZwpInputMethodManagerV2Id, zwp_input_method_manager_v2::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/text_input/zwp_input_method_v2.rs b/src/ifs/wl_seat/text_input/zwp_input_method_v2.rs index 52239870..3848bc56 100644 --- a/src/ifs/wl_seat/text_input/zwp_input_method_v2.rs +++ b/src/ifs/wl_seat/text_input/zwp_input_method_v2.rs @@ -3,11 +3,11 @@ use { client::{Client, ClientError}, ifs::{ wl_seat::{ - text_input::{ - zwp_input_method_keyboard_grab_v2::ZwpInputMethodKeyboardGrabV2, - TextDisconnectReason, TextInputConnection, MAX_TEXT_SIZE, - }, WlSeatGlobal, + text_input::{ + MAX_TEXT_SIZE, TextDisconnectReason, TextInputConnection, + zwp_input_method_keyboard_grab_v2::ZwpInputMethodKeyboardGrabV2, + }, }, wl_surface::zwp_input_popup_surface_v2::{ ZwpInputPopupSurfaceV2, ZwpInputPopupSurfaceV2Error, @@ -17,7 +17,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::{clonecell::CloneCell, numcell::NumCell, smallmap::SmallMap}, - wire::{zwp_input_method_v2::*, ZwpInputMethodV2Id, ZwpInputPopupSurfaceV2Id}, + wire::{ZwpInputMethodV2Id, ZwpInputPopupSurfaceV2Id, zwp_input_method_v2::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs b/src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs index 0f30bc68..58e95f73 100644 --- a/src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs +++ b/src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::text_input::zwp_text_input_v3::ZwpTextInputV3, leaks::Tracker, object::{Object, Version}, - wire::{zwp_text_input_manager_v3::*, ZwpTextInputManagerV3Id}, + wire::{ZwpTextInputManagerV3Id, zwp_text_input_manager_v3::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/text_input/zwp_text_input_v3.rs b/src/ifs/wl_seat/text_input/zwp_text_input_v3.rs index 6ac51501..5bf746d3 100644 --- a/src/ifs/wl_seat/text_input/zwp_text_input_v3.rs +++ b/src/ifs/wl_seat/text_input/zwp_text_input_v3.rs @@ -3,11 +3,11 @@ use { client::{Client, ClientError}, ifs::{ wl_seat::{ - text_input::{ - zwp_input_method_v2::ZwpInputMethodV2, TextConnectReason, TextDisconnectReason, - TextInputConnection, MAX_TEXT_SIZE, - }, WlSeatGlobal, + text_input::{ + MAX_TEXT_SIZE, TextConnectReason, TextDisconnectReason, TextInputConnection, + zwp_input_method_v2::ZwpInputMethodV2, + }, }, wl_surface::WlSurface, }, @@ -15,7 +15,7 @@ use { object::{Object, Version}, rect::Rect, utils::{clonecell::CloneCell, numcell::NumCell}, - wire::{zwp_text_input_v3::*, ZwpTextInputV3Id}, + wire::{ZwpTextInputV3Id, zwp_text_input_v3::*}, }, std::{cell::RefCell, collections::hash_map::Entry, mem, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/wl_keyboard.rs b/src/ifs/wl_seat/wl_keyboard.rs index 94aadd30..a8890f50 100644 --- a/src/ifs/wl_seat/wl_keyboard.rs +++ b/src/ifs/wl_seat/wl_keyboard.rs @@ -7,7 +7,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::{errorfmt::ErrorFmt, vecset::VecSet}, - wire::{wl_keyboard::*, WlKeyboardId, WlSurfaceId}, + wire::{WlKeyboardId, WlSurfaceId, wl_keyboard::*}, }, kbvm::Components, std::{ diff --git a/src/ifs/wl_seat/wl_pointer.rs b/src/ifs/wl_seat/wl_pointer.rs index f1bce71e..a3fbfe6d 100644 --- a/src/ifs/wl_seat/wl_pointer.rs +++ b/src/ifs/wl_seat/wl_pointer.rs @@ -6,7 +6,7 @@ use { ifs::{wl_seat::WlSeat, wl_surface::WlSurfaceError}, leaks::Tracker, object::{Object, Version}, - wire::{wl_pointer::*, WlPointerId, WlSurfaceId}, + wire::{WlPointerId, WlSurfaceId, wl_pointer::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/wl_touch.rs b/src/ifs/wl_seat/wl_touch.rs index fba96452..e423571f 100644 --- a/src/ifs/wl_seat/wl_touch.rs +++ b/src/ifs/wl_seat/wl_touch.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::WlSeat, leaks::Tracker, object::{Object, Version}, - wire::{wl_touch::*, WlSurfaceId, WlTouchId}, + wire::{WlSurfaceId, WlTouchId, wl_touch::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs index 2c1b83b8..52df6cf4 100644 --- a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs @@ -5,8 +5,8 @@ use { globals::{Global, GlobalName}, ifs::{ wl_seat::{ - zwp_pointer_constraints_v1::zwp_confined_pointer_v1::ZwpConfinedPointerV1, WlSeatGlobal, + zwp_pointer_constraints_v1::zwp_confined_pointer_v1::ZwpConfinedPointerV1, }, wl_surface::WlSurface, }, @@ -15,8 +15,8 @@ use { rect::{Rect, Region}, utils::clonecell::CloneCell, wire::{ - zwp_pointer_constraints_v1::*, WlPointerId, WlRegionId, WlSurfaceId, - ZwpPointerConstraintsV1Id, + WlPointerId, WlRegionId, WlSurfaceId, ZwpPointerConstraintsV1Id, + zwp_pointer_constraints_v1::*, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs b/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs index 418a2669..dfc1d510 100644 --- a/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs @@ -6,7 +6,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_confined_pointer_v1::*, ZwpConfinedPointerV1Id}, + wire::{ZwpConfinedPointerV1Id, zwp_confined_pointer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs b/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs index 581df25c..64a5735f 100644 --- a/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs @@ -6,7 +6,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_locked_pointer_v1::*, ZwpLockedPointerV1Id}, + wire::{ZwpLockedPointerV1Id, zwp_locked_pointer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_gesture_hold_v1.rs b/src/ifs/wl_seat/zwp_pointer_gesture_hold_v1.rs index f636b8e1..728a0591 100644 --- a/src/ifs/wl_seat/zwp_pointer_gesture_hold_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_gesture_hold_v1.rs @@ -4,7 +4,7 @@ use { ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface}, leaks::Tracker, object::{Object, Version}, - wire::{zwp_pointer_gesture_hold_v1::*, ZwpPointerGestureHoldV1Id}, + wire::{ZwpPointerGestureHoldV1Id, zwp_pointer_gesture_hold_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_gesture_pinch_v1.rs b/src/ifs/wl_seat/zwp_pointer_gesture_pinch_v1.rs index b6f05684..b758ea48 100644 --- a/src/ifs/wl_seat/zwp_pointer_gesture_pinch_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_gesture_pinch_v1.rs @@ -5,7 +5,7 @@ use { ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface}, leaks::Tracker, object::{Object, Version}, - wire::{zwp_pointer_gesture_pinch_v1::*, ZwpPointerGesturePinchV1Id}, + wire::{ZwpPointerGesturePinchV1Id, zwp_pointer_gesture_pinch_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_gesture_swipe_v1.rs b/src/ifs/wl_seat/zwp_pointer_gesture_swipe_v1.rs index 5ad4dc5e..e8a0f5dc 100644 --- a/src/ifs/wl_seat/zwp_pointer_gesture_swipe_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_gesture_swipe_v1.rs @@ -5,7 +5,7 @@ use { ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface}, leaks::Tracker, object::{Object, Version}, - wire::{zwp_pointer_gesture_swipe_v1::*, ZwpPointerGestureSwipeV1Id}, + wire::{ZwpPointerGestureSwipeV1Id, zwp_pointer_gesture_swipe_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs b/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs index a7f76c67..91430a6a 100644 --- a/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs +++ b/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs @@ -9,7 +9,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_pointer_gestures_v1::*, ZwpPointerGesturesV1Id}, + wire::{ZwpPointerGesturesV1Id, zwp_pointer_gestures_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs b/src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs index f04e80eb..4a44679f 100644 --- a/src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs +++ b/src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::zwp_relative_pointer_v1::ZwpRelativePointerV1, leaks::Tracker, object::{Object, Version}, - wire::{zwp_relative_pointer_manager_v1::*, ZwpRelativePointerManagerV1Id}, + wire::{ZwpRelativePointerManagerV1Id, zwp_relative_pointer_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_relative_pointer_v1.rs b/src/ifs/wl_seat/zwp_relative_pointer_v1.rs index 4b869f7a..92234bad 100644 --- a/src/ifs/wl_seat/zwp_relative_pointer_v1.rs +++ b/src/ifs/wl_seat/zwp_relative_pointer_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_seat::WlSeat, leaks::Tracker, object::{Object, Version}, - wire::{zwp_relative_pointer_v1::*, ZwpRelativePointerV1Id}, + wire::{ZwpRelativePointerV1Id, zwp_relative_pointer_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_virtual_keyboard_manager_v1.rs b/src/ifs/wl_seat/zwp_virtual_keyboard_manager_v1.rs index 58e5f6fa..88c3fe66 100644 --- a/src/ifs/wl_seat/zwp_virtual_keyboard_manager_v1.rs +++ b/src/ifs/wl_seat/zwp_virtual_keyboard_manager_v1.rs @@ -1,12 +1,12 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_VIRTUAL_KEYBOARD_MANAGER}, + client::{CAP_VIRTUAL_KEYBOARD_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::wl_seat::zwp_virtual_keyboard_v1::ZwpVirtualKeyboardV1, keyboard::KeyboardState, leaks::Tracker, object::{Object, Version}, - wire::{zwp_virtual_keyboard_manager_v1::*, ZwpVirtualKeyboardManagerV1Id}, + wire::{ZwpVirtualKeyboardManagerV1Id, zwp_virtual_keyboard_manager_v1::*}, }, std::{cell::RefCell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs b/src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs index 4ef07028..ad810d1b 100644 --- a/src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs +++ b/src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs @@ -5,8 +5,8 @@ use { clientmem::{ClientMem, ClientMemError}, ifs::{ wl_seat::{ - wl_keyboard::{self, WlKeyboard}, WlSeatGlobal, + wl_keyboard::{self, WlKeyboard}, }, wl_surface::WlSurface, }, @@ -14,7 +14,7 @@ use { keyboard::KeyboardState, leaks::Tracker, object::{Object, Version}, - wire::{zwp_virtual_keyboard_v1::*, ZwpVirtualKeyboardV1Id}, + wire::{ZwpVirtualKeyboardV1Id, zwp_virtual_keyboard_v1::*}, }, std::{cell::RefCell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_shm.rs b/src/ifs/wl_shm.rs index 3748a6d0..93774566 100644 --- a/src/ifs/wl_shm.rs +++ b/src/ifs/wl_shm.rs @@ -6,7 +6,7 @@ use { ifs::wl_shm_pool::{WlShmPool, WlShmPoolError}, leaks::Tracker, object::{Object, Version}, - wire::{wl_shm::*, WlShmId}, + wire::{WlShmId, wl_shm::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_shm_pool.rs b/src/ifs/wl_shm_pool.rs index b03dd608..9c10c5d2 100644 --- a/src/ifs/wl_shm_pool.rs +++ b/src/ifs/wl_shm_pool.rs @@ -7,7 +7,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::clonecell::CloneCell, - wire::{wl_shm_pool::*, WlShmPoolId}, + wire::{WlShmPoolId, wl_shm_pool::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_subcompositor.rs b/src/ifs/wl_subcompositor.rs index 91ca485a..b64095d9 100644 --- a/src/ifs/wl_subcompositor.rs +++ b/src/ifs/wl_subcompositor.rs @@ -5,7 +5,7 @@ use { ifs::wl_surface::wl_subsurface::{WlSubsurface, WlSubsurfaceError}, leaks::Tracker, object::{Object, Version}, - wire::{wl_subcompositor::*, WlSubcompositorId}, + wire::{WlSubcompositorId, wl_subcompositor::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface.rs b/src/ifs/wl_surface.rs index 27727807..e63c953f 100644 --- a/src/ifs/wl_surface.rs +++ b/src/ifs/wl_surface.rs @@ -34,6 +34,7 @@ use { wl_buffer::WlBuffer, wl_callback::WlCallback, wl_seat::{ + Dnd, NodeSeatState, SeatId, WlSeatGlobal, tablet::{ PadButtonState, TabletPad, TabletPadGroup, TabletPadRing, TabletPadStrip, TabletRingEventSource, TabletStripEventSource, TabletTool, TabletToolChanges, @@ -42,7 +43,6 @@ use { text_input::TextInputConnection, wl_pointer::PendingScroll, zwp_pointer_constraints_v1::SeatConstraint, - Dnd, NodeSeatState, SeatId, WlSeatGlobal, }, wl_surface::{ commit_timeline::{ClearReason, CommitTimeline, CommitTimelineError}, @@ -57,12 +57,12 @@ use { wp_linux_drm_syncobj_surface_v1::WpLinuxDrmSyncobjSurfaceV1, wp_tearing_control_v1::WpTearingControlV1, wp_viewport::WpViewport, - x_surface::{xwindow::Xwindow, XSurface}, - xdg_surface::{xdg_toplevel::XdgToplevel, PendingXdgSurfaceData, XdgSurfaceError}, + x_surface::{XSurface, xwindow::Xwindow}, + xdg_surface::{PendingXdgSurfaceData, XdgSurfaceError, xdg_toplevel::XdgToplevel}, zwlr_layer_surface_v1::{PendingLayerSurfaceData, ZwlrLayerSurfaceV1Error}, }, wp_content_type_v1::ContentType, - wp_presentation_feedback::{WpPresentationFeedback, VRR_REFRESH_SINCE}, + wp_presentation_feedback::{VRR_REFRESH_SINCE, WpPresentationFeedback}, zwp_linux_dmabuf_feedback_v1::ZwpLinuxDmabufFeedbackV1, }, io_uring::IoUringError, @@ -87,8 +87,8 @@ use { drm::sync_obj::{SyncObj, SyncObjPoint}, }, wire::{ - wl_surface::*, WlOutputId, WlSurfaceId, ZwpIdleInhibitorV1Id, - ZwpLinuxDmabufFeedbackV1Id, + WlOutputId, WlSurfaceId, ZwpIdleInhibitorV1Id, ZwpLinuxDmabufFeedbackV1Id, + wl_surface::*, }, xwayland::XWaylandEvent, }, @@ -847,7 +847,7 @@ impl WlSurface { id: self.id, old, new, - }) + }); } } self.role.set(role); diff --git a/src/ifs/wl_surface/commit_timeline.rs b/src/ifs/wl_surface/commit_timeline.rs index d41d11a3..f526ef6e 100644 --- a/src/ifs/wl_surface/commit_timeline.rs +++ b/src/ifs/wl_surface/commit_timeline.rs @@ -21,9 +21,9 @@ use { queue::AsyncQueue, }, video::drm::{ + DrmError, sync_obj::{SyncObj, SyncObjPoint}, wait_for_sync_obj::{SyncObjWaiter, WaitForSyncObj, WaitForSyncObjHandle}, - DrmError, }, }, isnt::std_1::{primitive::IsntSliceExt, vec::IsntVecExt}, @@ -36,7 +36,7 @@ use { slice, }, thiserror::Error, - uapi::{c::c_short, OwnedFd}, + uapi::{OwnedFd, c::c_short}, }; const MAX_TIMELINE_DEPTH: usize = 256; diff --git a/src/ifs/wl_surface/ext_session_lock_surface_v1.rs b/src/ifs/wl_surface/ext_session_lock_surface_v1.rs index ff429495..4c4cba36 100644 --- a/src/ifs/wl_surface/ext_session_lock_surface_v1.rs +++ b/src/ifs/wl_surface/ext_session_lock_surface_v1.rs @@ -12,7 +12,7 @@ use { rect::Rect, tree::{FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeVisitor}, utils::numcell::NumCell, - wire::{ext_session_lock_surface_v1::*, ExtSessionLockSurfaceV1Id, WlSurfaceId}, + wire::{ExtSessionLockSurfaceV1Id, WlSurfaceId, ext_session_lock_surface_v1::*}, }, std::rc::Rc, thiserror::Error, @@ -157,7 +157,9 @@ pub enum ExtSessionLockSurfaceV1Error { ClientError(Box), #[error(transparent)] WlSurfaceError(#[from] WlSurfaceError), - #[error("Surface {0} cannot be turned into an ext_session_lock_surface because it already has an attached ext_session_lock_surface")] + #[error( + "Surface {0} cannot be turned into an ext_session_lock_surface because it already has an attached ext_session_lock_surface" + )] AlreadyAttached(WlSurfaceId), } efrom!(ExtSessionLockSurfaceV1Error, ClientError); diff --git a/src/ifs/wl_surface/tray.rs b/src/ifs/wl_surface/tray.rs index 7c8f873e..96424d07 100644 --- a/src/ifs/wl_surface/tray.rs +++ b/src/ifs/wl_surface/tray.rs @@ -5,8 +5,8 @@ use { wl_output::OutputGlobalOpt, wl_seat::{NodeSeatState, WlSeatGlobal}, wl_surface::{ - xdg_surface::xdg_popup::{XdgPopup, XdgPopupParent}, PendingState, SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError, + xdg_surface::xdg_popup::{XdgPopup, XdgPopupParent}, }, }, rect::Rect, diff --git a/src/ifs/wl_surface/tray/jay_tray_item_v1.rs b/src/ifs/wl_surface/tray/jay_tray_item_v1.rs index 64d387b4..cee06bb9 100644 --- a/src/ifs/wl_surface/tray/jay_tray_item_v1.rs +++ b/src/ifs/wl_surface/tray/jay_tray_item_v1.rs @@ -3,11 +3,11 @@ use { ifs::{ wl_output::OutputGlobalOpt, wl_surface::{ - tray::{ - ack_configure, destroy, get_popup, install, DynTrayItem, FocusHint, Popup, - TrayItem, TrayItemData, TrayItemError, - }, WlSurface, + tray::{ + DynTrayItem, FocusHint, Popup, TrayItem, TrayItemData, TrayItemError, + ack_configure, destroy, get_popup, install, + }, }, xdg_positioner::{ANCHOR_BOTTOM_LEFT, ANCHOR_BOTTOM_RIGHT}, }, @@ -15,7 +15,7 @@ use { object::{Object, Version}, tree::NodeVisitor, utils::copyhashmap::CopyHashMap, - wire::{jay_tray_item_v1::*, JayTrayItemV1Id, XdgPopupId}, + wire::{JayTrayItemV1Id, XdgPopupId, jay_tray_item_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/wl_subsurface.rs b/src/ifs/wl_surface/wl_subsurface.rs index 8fe4ce4e..5c19019a 100644 --- a/src/ifs/wl_surface/wl_subsurface.rs +++ b/src/ifs/wl_surface/wl_subsurface.rs @@ -13,7 +13,7 @@ use { linkedlist::{LinkedNode, NodeRef}, numcell::NumCell, }, - wire::{wl_subsurface::*, WlSubsurfaceId}, + wire::{WlSubsurfaceId, wl_subsurface::*}, }, std::{ cell::{Cell, RefCell, RefMut}, diff --git a/src/ifs/wl_surface/wp_alpha_modifier_surface_v1.rs b/src/ifs/wl_surface/wp_alpha_modifier_surface_v1.rs index 36ae3b65..7d96e2e6 100644 --- a/src/ifs/wl_surface/wp_alpha_modifier_surface_v1.rs +++ b/src/ifs/wl_surface/wp_alpha_modifier_surface_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{wp_alpha_modifier_surface_v1::*, WpAlphaModifierSurfaceV1Id}, + wire::{WpAlphaModifierSurfaceV1Id, wp_alpha_modifier_surface_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/wp_commit_timer_v1.rs b/src/ifs/wl_surface/wp_commit_timer_v1.rs index f255b738..064284ac 100644 --- a/src/ifs/wl_surface/wp_commit_timer_v1.rs +++ b/src/ifs/wl_surface/wp_commit_timer_v1.rs @@ -5,8 +5,8 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ - wp_commit_timer_v1::{Destroy, SetTimestamp, WpCommitTimerV1RequestHandler}, WpCommitTimerV1Id, + wp_commit_timer_v1::{Destroy, SetTimestamp, WpCommitTimerV1RequestHandler}, }, }, std::rc::Rc, diff --git a/src/ifs/wl_surface/wp_fifo_v1.rs b/src/ifs/wl_surface/wp_fifo_v1.rs index d68e6734..5df456a5 100644 --- a/src/ifs/wl_surface/wp_fifo_v1.rs +++ b/src/ifs/wl_surface/wp_fifo_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{wp_fifo_v1::*, WpFifoV1Id}, + wire::{WpFifoV1Id, wp_fifo_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/wp_fractional_scale_v1.rs b/src/ifs/wl_surface/wp_fractional_scale_v1.rs index 0e95ff07..47fadbe5 100644 --- a/src/ifs/wl_surface/wp_fractional_scale_v1.rs +++ b/src/ifs/wl_surface/wp_fractional_scale_v1.rs @@ -6,7 +6,7 @@ use { object::{Object, Version}, scale::Scale, utils::cell_ext::CellExt, - wire::{wp_fractional_scale_v1::*, WpFractionalScaleV1Id}, + wire::{WpFractionalScaleV1Id, wp_fractional_scale_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/wp_linux_drm_syncobj_surface_v1.rs b/src/ifs/wl_surface/wp_linux_drm_syncobj_surface_v1.rs index c0f32f07..fea9caab 100644 --- a/src/ifs/wl_surface/wp_linux_drm_syncobj_surface_v1.rs +++ b/src/ifs/wl_surface/wp_linux_drm_syncobj_surface_v1.rs @@ -5,7 +5,7 @@ use { leaks::Tracker, object::{Object, Version}, video::drm::sync_obj::SyncObjPoint, - wire::{wp_linux_drm_syncobj_surface_v1::*, WpLinuxDrmSyncobjSurfaceV1Id}, + wire::{WpLinuxDrmSyncobjSurfaceV1Id, wp_linux_drm_syncobj_surface_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/wp_tearing_control_v1.rs b/src/ifs/wl_surface/wp_tearing_control_v1.rs index 57316e7c..046a6be0 100644 --- a/src/ifs/wl_surface/wp_tearing_control_v1.rs +++ b/src/ifs/wl_surface/wp_tearing_control_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{wp_tearing_control_v1::*, WlSurfaceId, WpTearingControlV1Id}, + wire::{WlSurfaceId, WpTearingControlV1Id, wp_tearing_control_v1::*}, }, std::{fmt::Debug, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_surface/wp_viewport.rs b/src/ifs/wl_surface/wp_viewport.rs index 1c03ff47..387f8a0a 100644 --- a/src/ifs/wl_surface/wp_viewport.rs +++ b/src/ifs/wl_surface/wp_viewport.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{wp_viewport::*, WpViewportId}, + wire::{WpViewportId, wp_viewport::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/x_surface.rs b/src/ifs/wl_surface/x_surface.rs index 6ec00063..a2f1361a 100644 --- a/src/ifs/wl_surface/x_surface.rs +++ b/src/ifs/wl_surface/x_surface.rs @@ -1,8 +1,8 @@ use { crate::{ ifs::wl_surface::{ - x_surface::{xwayland_surface_v1::XwaylandSurfaceV1, xwindow::Xwindow}, SurfaceExt, WlSurface, WlSurfaceError, + x_surface::{xwayland_surface_v1::XwaylandSurfaceV1, xwindow::Xwindow}, }, leaks::Tracker, tree::{Node, ToplevelNode, ToplevelNodeBase}, diff --git a/src/ifs/wl_surface/x_surface/xwayland_surface_v1.rs b/src/ifs/wl_surface/x_surface/xwayland_surface_v1.rs index aac1fb54..71a87d23 100644 --- a/src/ifs/wl_surface/x_surface/xwayland_surface_v1.rs +++ b/src/ifs/wl_surface/x_surface/xwayland_surface_v1.rs @@ -1,11 +1,11 @@ use { crate::{ client::{Client, ClientError}, - ifs::wl_surface::{x_surface::XSurface, WlSurfaceError}, + ifs::wl_surface::{WlSurfaceError, x_surface::XSurface}, leaks::Tracker, object::{Object, Version}, utils::cell_ext::CellExt, - wire::{xwayland_surface_v1::*, XwaylandSurfaceV1Id}, + wire::{XwaylandSurfaceV1Id, xwayland_surface_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/x_surface/xwindow.rs b/src/ifs/wl_surface/x_surface/xwindow.rs index d182a543..5d159313 100644 --- a/src/ifs/wl_surface/x_surface/xwindow.rs +++ b/src/ifs/wl_surface/x_surface/xwindow.rs @@ -4,16 +4,16 @@ use { cursor::KnownCursor, fixed::Fixed, ifs::{ - wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal}, - wl_surface::{x_surface::XSurface, WlSurface, WlSurfaceError}, + wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool}, + wl_surface::{WlSurface, WlSurfaceError, x_surface::XSurface}, }, rect::Rect, renderer::Renderer, state::State, tree::{ - default_tile_drag_destination, ContainerSplit, Direction, FindTreeResult, - FindTreeUsecase, FoundNode, Node, NodeId, NodeVisitor, StackedNode, - TileDragDestination, ToplevelData, ToplevelNode, ToplevelNodeBase, WorkspaceNode, + ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + NodeVisitor, StackedNode, TileDragDestination, ToplevelData, ToplevelNode, + ToplevelNodeBase, WorkspaceNode, default_tile_drag_destination, }, utils::{clonecell::CloneCell, copyhashmap::CopyHashMap, linkedlist::LinkedNode}, wire::WlSurfaceId, diff --git a/src/ifs/wl_surface/xdg_surface.rs b/src/ifs/wl_surface/xdg_surface.rs index 68aacaac..d0b9e433 100644 --- a/src/ifs/wl_surface/xdg_surface.rs +++ b/src/ifs/wl_surface/xdg_surface.rs @@ -6,12 +6,12 @@ use { client::ClientError, ifs::{ wl_surface::{ + PendingState, SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError, tray::TrayItemId, xdg_surface::{ xdg_popup::{XdgPopup, XdgPopupError, XdgPopupParent}, - xdg_toplevel::{XdgToplevel, WM_CAPABILITIES_SINCE}, + xdg_toplevel::{WM_CAPABILITIES_SINCE, XdgToplevel}, }, - PendingState, SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError, }, xdg_wm_base::XdgWmBase, }, @@ -28,7 +28,7 @@ use { option_ext::OptionExt, rc_eq::rc_eq, }, - wire::{xdg_surface::*, WlSurfaceId, XdgPopupId, XdgSurfaceId}, + wire::{WlSurfaceId, XdgPopupId, XdgSurfaceId, xdg_surface::*}, }, std::{ cell::{Cell, RefCell, RefMut}, @@ -254,7 +254,7 @@ impl XdgSurface { id: self.id, old, new, - }) + }); } } self.role.set(role); @@ -551,7 +551,9 @@ impl SurfaceExt for XdgSurface { #[derive(Debug, Error)] pub enum XdgSurfaceError { - #[error("Surface {0} cannot be turned into a xdg_surface because it already has an attached xdg_surface")] + #[error( + "Surface {0} cannot be turned into a xdg_surface because it already has an attached xdg_surface" + )] AlreadyAttached(WlSurfaceId), #[error(transparent)] XdgPopupError(#[from] XdgPopupError), @@ -565,7 +567,9 @@ pub enum XdgSurfaceError { ClientError(Box), #[error("Tried no set a non-positive width/height")] NonPositiveWidthHeight, - #[error("Cannot destroy xdg_surface {0} because it's associated xdg_toplevel/popup is not yet destroyed")] + #[error( + "Cannot destroy xdg_surface {0} because it's associated xdg_toplevel/popup is not yet destroyed" + )] RoleNotYetDestroyed(XdgSurfaceId), #[error("The surface still has popups attached")] PopupsNotYetDestroyed, diff --git a/src/ifs/wl_surface/xdg_surface/xdg_popup.rs b/src/ifs/wl_surface/xdg_surface/xdg_popup.rs index ae2d80f5..937808d2 100644 --- a/src/ifs/wl_surface/xdg_surface/xdg_popup.rs +++ b/src/ifs/wl_surface/xdg_surface/xdg_popup.rs @@ -4,14 +4,14 @@ use { cursor::KnownCursor, fixed::Fixed, ifs::{ - wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal}, + wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool}, wl_surface::{ tray::TrayItemId, xdg_surface::{XdgSurface, XdgSurfaceError, XdgSurfaceExt}, }, xdg_positioner::{ - XdgPositioned, XdgPositioner, CA_FLIP_X, CA_FLIP_Y, CA_RESIZE_X, CA_RESIZE_Y, - CA_SLIDE_X, CA_SLIDE_Y, + CA_FLIP_X, CA_FLIP_Y, CA_RESIZE_X, CA_RESIZE_Y, CA_SLIDE_X, CA_SLIDE_Y, + XdgPositioned, XdgPositioner, }, }, leaks::Tracker, @@ -23,7 +23,7 @@ use { StackedNode, }, utils::clonecell::CloneCell, - wire::{xdg_popup::*, XdgPopupId}, + wire::{XdgPopupId, xdg_popup::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs b/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs index 0a8e5ce9..afd9376d 100644 --- a/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs +++ b/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs @@ -9,13 +9,13 @@ use { fixed::Fixed, ifs::{ ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1, - wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal}, + wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool}, wl_surface::{ - xdg_surface::{ - xdg_toplevel::xdg_dialog_v1::XdgDialogV1, XdgSurface, XdgSurfaceError, - XdgSurfaceExt, - }, WlSurface, + xdg_surface::{ + XdgSurface, XdgSurfaceError, XdgSurfaceExt, + xdg_toplevel::xdg_dialog_v1::XdgDialogV1, + }, }, xdg_toplevel_drag_v1::XdgToplevelDragV1, }, @@ -25,12 +25,12 @@ use { renderer::Renderer, state::State, tree::{ - default_tile_drag_destination, ContainerSplit, Direction, FindTreeResult, - FindTreeUsecase, FoundNode, Node, NodeId, NodeVisitor, OutputNode, TileDragDestination, - ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelNodeId, WorkspaceNode, + ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + NodeVisitor, OutputNode, TileDragDestination, ToplevelData, ToplevelNode, + ToplevelNodeBase, ToplevelNodeId, WorkspaceNode, default_tile_drag_destination, }, utils::{clonecell::CloneCell, hash_map_ext::HashMapExt}, - wire::{xdg_toplevel::*, XdgToplevelId}, + wire::{XdgToplevelId, xdg_toplevel::*}, }, ahash::{AHashMap, AHashSet}, num_derive::FromPrimitive, diff --git a/src/ifs/wl_surface/xdg_surface/xdg_toplevel/xdg_dialog_v1.rs b/src/ifs/wl_surface/xdg_surface/xdg_toplevel/xdg_dialog_v1.rs index c9170ea1..ef582f9f 100644 --- a/src/ifs/wl_surface/xdg_surface/xdg_toplevel/xdg_dialog_v1.rs +++ b/src/ifs/wl_surface/xdg_surface/xdg_toplevel/xdg_dialog_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::xdg_surface::xdg_toplevel::XdgToplevel, leaks::Tracker, object::{Object, Version}, - wire::{xdg_dialog_v1::*, XdgDialogV1Id, XdgToplevelId}, + wire::{XdgDialogV1Id, XdgToplevelId, xdg_dialog_v1::*}, }, std::{fmt::Debug, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wl_surface/xwayland_shell_v1.rs b/src/ifs/wl_surface/xwayland_shell_v1.rs index d865f174..a0aaae1f 100644 --- a/src/ifs/wl_surface/xwayland_shell_v1.rs +++ b/src/ifs/wl_surface/xwayland_shell_v1.rs @@ -2,10 +2,10 @@ use { crate::{ client::{Client, ClientError}, globals::{Global, GlobalName}, - ifs::wl_surface::{x_surface::xwayland_surface_v1::XwaylandSurfaceV1, WlSurfaceError}, + ifs::wl_surface::{WlSurfaceError, x_surface::xwayland_surface_v1::XwaylandSurfaceV1}, leaks::Tracker, object::{Object, Version}, - wire::{xwayland_shell_v1::*, WlSurfaceId, XwaylandShellV1Id}, + wire::{WlSurfaceId, XwaylandShellV1Id, xwayland_shell_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/zwlr_layer_surface_v1.rs b/src/ifs/wl_surface/zwlr_layer_surface_v1.rs index d7996a08..5a347210 100644 --- a/src/ifs/wl_surface/zwlr_layer_surface_v1.rs +++ b/src/ifs/wl_surface/zwlr_layer_surface_v1.rs @@ -5,10 +5,10 @@ use { wl_output::OutputGlobalOpt, wl_seat::NodeSeatState, wl_surface::{ - xdg_surface::xdg_popup::{XdgPopup, XdgPopupParent}, PendingState, SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError, + xdg_surface::xdg_popup::{XdgPopup, XdgPopupParent}, }, - zwlr_layer_shell_v1::{ZwlrLayerShellV1, OVERLAY}, + zwlr_layer_shell_v1::{OVERLAY, ZwlrLayerShellV1}, }, leaks::Tracker, object::Object, @@ -26,7 +26,7 @@ use { numcell::NumCell, option_ext::OptionExt, }, - wire::{zwlr_layer_surface_v1::*, WlSurfaceId, XdgPopupId, ZwlrLayerSurfaceV1Id}, + wire::{WlSurfaceId, XdgPopupId, ZwlrLayerSurfaceV1Id, zwlr_layer_surface_v1::*}, }, std::{ cell::{Cell, RefCell, RefMut}, @@ -723,7 +723,9 @@ simple_add_obj!(ZwlrLayerSurfaceV1); #[derive(Debug, Error)] pub enum ZwlrLayerSurfaceV1Error { - #[error("Surface {0} cannot be turned into a zwlr_layer_surface because it already has an attached zwlr_layer_surface")] + #[error( + "Surface {0} cannot be turned into a zwlr_layer_surface because it already has an attached zwlr_layer_surface" + )] AlreadyAttached(WlSurfaceId), #[error("Width was set to 0 but anchor did not contain LEFT and RIGHT")] WidthZero, diff --git a/src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs b/src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs index 3bbc9fe1..3c945c5c 100644 --- a/src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs +++ b/src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{zwp_idle_inhibitor_v1::*, ZwpIdleInhibitorV1Id}, + wire::{ZwpIdleInhibitorV1Id, zwp_idle_inhibitor_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wl_surface/zwp_input_popup_surface_v2.rs b/src/ifs/wl_surface/zwp_input_popup_surface_v2.rs index 4f246b23..5580e9fd 100644 --- a/src/ifs/wl_surface/zwp_input_popup_surface_v2.rs +++ b/src/ifs/wl_surface/zwp_input_popup_surface_v2.rs @@ -9,7 +9,7 @@ use { object::{Object, Version}, rect::Rect, state::State, - wire::{zwp_input_popup_surface_v2::*, WlSurfaceId, ZwpInputPopupSurfaceV2Id}, + wire::{WlSurfaceId, ZwpInputPopupSurfaceV2Id, zwp_input_popup_surface_v2::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, @@ -183,7 +183,9 @@ pub enum ZwpInputPopupSurfaceV2Error { ClientError(Box), #[error(transparent)] WlSurfaceError(Box), - #[error("Surface {0} cannot be turned into a zwp_input_popup_surface_v2 because it already has an attached zwp_input_popup_surface_v2")] + #[error( + "Surface {0} cannot be turned into a zwp_input_popup_surface_v2 because it already has an attached zwp_input_popup_surface_v2" + )] AlreadyAttached(WlSurfaceId), } efrom!(ZwpInputPopupSurfaceV2Error, WlSurfaceError); diff --git a/src/ifs/workspace_manager/ext_workspace_group_handle_v1.rs b/src/ifs/workspace_manager/ext_workspace_group_handle_v1.rs index 7c10f4e8..5c877e70 100644 --- a/src/ifs/workspace_manager/ext_workspace_group_handle_v1.rs +++ b/src/ifs/workspace_manager/ext_workspace_group_handle_v1.rs @@ -13,7 +13,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::opt::Opt, - wire::{ext_workspace_group_handle_v1::*, ExtWorkspaceGroupHandleV1Id}, + wire::{ExtWorkspaceGroupHandleV1Id, ext_workspace_group_handle_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/workspace_manager/ext_workspace_handle_v1.rs b/src/ifs/workspace_manager/ext_workspace_handle_v1.rs index a23d8c7b..2dd2d52b 100644 --- a/src/ifs/workspace_manager/ext_workspace_handle_v1.rs +++ b/src/ifs/workspace_manager/ext_workspace_handle_v1.rs @@ -12,7 +12,7 @@ use { object::{Object, Version}, tree::{OutputNode, WorkspaceNode}, utils::{clonecell::CloneCell, opt::Opt}, - wire::{ext_workspace_handle_v1::*, ExtWorkspaceHandleV1Id}, + wire::{ExtWorkspaceHandleV1Id, ext_workspace_handle_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/workspace_manager/ext_workspace_manager_v1.rs b/src/ifs/workspace_manager/ext_workspace_manager_v1.rs index 6ee14716..0893353e 100644 --- a/src/ifs/workspace_manager/ext_workspace_manager_v1.rs +++ b/src/ifs/workspace_manager/ext_workspace_manager_v1.rs @@ -1,6 +1,6 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_WORKSPACE}, + client::{CAP_WORKSPACE, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::{ wl_output::OutputGlobalOpt, @@ -11,9 +11,9 @@ use { }, leaks::Tracker, object::{Object, Version}, - tree::{move_ws_to_output, OutputNode, WorkspaceNode, WsMoveConfig}, + tree::{OutputNode, WorkspaceNode, WsMoveConfig, move_ws_to_output}, utils::{clonecell::CloneCell, opt::Opt, syncqueue::SyncQueue}, - wire::{ext_workspace_manager_v1::*, ExtWorkspaceManagerV1Id}, + wire::{ExtWorkspaceManagerV1Id, ext_workspace_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wp_alpha_modifier_v1.rs b/src/ifs/wp_alpha_modifier_v1.rs index 36e0dacf..f727fe4e 100644 --- a/src/ifs/wp_alpha_modifier_v1.rs +++ b/src/ifs/wp_alpha_modifier_v1.rs @@ -7,7 +7,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{wp_alpha_modifier_v1::*, WpAlphaModifierV1Id}, + wire::{WpAlphaModifierV1Id, wp_alpha_modifier_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_commit_timing_manager_v1.rs b/src/ifs/wp_commit_timing_manager_v1.rs index a59107ce..66b51763 100644 --- a/src/ifs/wp_commit_timing_manager_v1.rs +++ b/src/ifs/wp_commit_timing_manager_v1.rs @@ -6,10 +6,10 @@ use { leaks::Tracker, object::{Object, Version}, wire::{ + WpCommitTimingManagerV1Id, wp_commit_timing_manager_v1::{ Destroy, GetTimer, WpCommitTimingManagerV1RequestHandler, }, - WpCommitTimingManagerV1Id, }, }, std::rc::Rc, diff --git a/src/ifs/wp_content_type_manager_v1.rs b/src/ifs/wp_content_type_manager_v1.rs index 1ce0a538..511f233d 100644 --- a/src/ifs/wp_content_type_manager_v1.rs +++ b/src/ifs/wp_content_type_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wp_content_type_v1::WpContentTypeV1, leaks::Tracker, object::{Object, Version}, - wire::{wp_content_type_manager_v1::*, WpContentTypeManagerV1Id}, + wire::{WpContentTypeManagerV1Id, wp_content_type_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_content_type_v1.rs b/src/ifs/wp_content_type_v1.rs index f0821f9a..0f60e715 100644 --- a/src/ifs/wp_content_type_v1.rs +++ b/src/ifs/wp_content_type_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{wp_content_type_v1::*, WpContentTypeV1Id}, + wire::{WpContentTypeV1Id, wp_content_type_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_cursor_shape_device_v1.rs b/src/ifs/wp_cursor_shape_device_v1.rs index aa47e892..9c021147 100644 --- a/src/ifs/wp_cursor_shape_device_v1.rs +++ b/src/ifs/wp_cursor_shape_device_v1.rs @@ -2,10 +2,10 @@ use { crate::{ client::{Client, ClientError}, cursor::KnownCursor, - ifs::wl_seat::{tablet::TabletToolOpt, WlSeatGlobal}, + ifs::wl_seat::{WlSeatGlobal, tablet::TabletToolOpt}, leaks::Tracker, object::{Object, Version}, - wire::{wp_cursor_shape_device_v1::*, WpCursorShapeDeviceV1Id}, + wire::{WpCursorShapeDeviceV1Id, wp_cursor_shape_device_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_cursor_shape_manager_v1.rs b/src/ifs/wp_cursor_shape_manager_v1.rs index b9c612cd..2018ae5e 100644 --- a/src/ifs/wp_cursor_shape_manager_v1.rs +++ b/src/ifs/wp_cursor_shape_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wp_cursor_shape_device_v1::{CursorShapeCursorUser, WpCursorShapeDeviceV1}, leaks::Tracker, object::{Object, Version}, - wire::{wp_cursor_shape_manager_v1::*, WpCursorShapeDeviceV1Id, WpCursorShapeManagerV1Id}, + wire::{WpCursorShapeDeviceV1Id, WpCursorShapeManagerV1Id, wp_cursor_shape_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_drm_lease_connector_v1.rs b/src/ifs/wp_drm_lease_connector_v1.rs index 136babd8..dd24549d 100644 --- a/src/ifs/wp_drm_lease_connector_v1.rs +++ b/src/ifs/wp_drm_lease_connector_v1.rs @@ -6,7 +6,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::bindings::Bindings, - wire::{wp_drm_lease_connector_v1::*, WpDrmLeaseConnectorV1Id}, + wire::{WpDrmLeaseConnectorV1Id, wp_drm_lease_connector_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_drm_lease_device_v1.rs b/src/ifs/wp_drm_lease_device_v1.rs index 88a5377f..bed1d342 100644 --- a/src/ifs/wp_drm_lease_device_v1.rs +++ b/src/ifs/wp_drm_lease_device_v1.rs @@ -1,7 +1,7 @@ use { crate::{ backend::DrmDeviceId, - client::{Client, ClientCaps, ClientError, CAP_DRM_LEASE}, + client::{CAP_DRM_LEASE, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::{ wp_drm_lease_connector_v1::WpDrmLeaseConnectorV1, @@ -12,11 +12,11 @@ use { state::OutputData, utils::{bindings::Bindings, errorfmt::ErrorFmt, oserror::OsError}, video::drm::{Drm, DrmError}, - wire::{wp_drm_lease_device_v1::*, WpDrmLeaseDeviceV1Id}, + wire::{WpDrmLeaseDeviceV1Id, wp_drm_lease_device_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; mod removed_device; diff --git a/src/ifs/wp_drm_lease_device_v1/removed_device.rs b/src/ifs/wp_drm_lease_device_v1/removed_device.rs index a529560c..6e520882 100644 --- a/src/ifs/wp_drm_lease_device_v1/removed_device.rs +++ b/src/ifs/wp_drm_lease_device_v1/removed_device.rs @@ -1,7 +1,7 @@ use { crate::{ backend::DrmDeviceId, - client::{Client, ClientCaps, ClientError, CAP_DRM_LEASE}, + client::{CAP_DRM_LEASE, Client, ClientCaps, ClientError}, globals::{Global, GlobalName, RemovableWaylandGlobal}, ifs::wp_drm_lease_device_v1::{WpDrmLeaseDeviceV1, WpDrmLeaseDeviceV1Global}, object::Version, diff --git a/src/ifs/wp_drm_lease_request_v1.rs b/src/ifs/wp_drm_lease_request_v1.rs index e942bb0a..a47f5580 100644 --- a/src/ifs/wp_drm_lease_request_v1.rs +++ b/src/ifs/wp_drm_lease_request_v1.rs @@ -6,7 +6,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::copyhashmap::CopyHashMap, - wire::{wp_drm_lease_request_v1::*, WpDrmLeaseConnectorV1Id, WpDrmLeaseRequestV1Id}, + wire::{WpDrmLeaseConnectorV1Id, WpDrmLeaseRequestV1Id, wp_drm_lease_request_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wp_drm_lease_v1.rs b/src/ifs/wp_drm_lease_v1.rs index 3613670e..f5250153 100644 --- a/src/ifs/wp_drm_lease_v1.rs +++ b/src/ifs/wp_drm_lease_v1.rs @@ -5,7 +5,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::clonecell::CloneCell, - wire::{wp_drm_lease_v1::*, WpDrmLeaseV1Id}, + wire::{WpDrmLeaseV1Id, wp_drm_lease_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wp_fifo_manager_v1.rs b/src/ifs/wp_fifo_manager_v1.rs index c0f47b59..270e8b56 100644 --- a/src/ifs/wp_fifo_manager_v1.rs +++ b/src/ifs/wp_fifo_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_surface::wp_fifo_v1::{WpFifoV1, WpFifoV1Error}, leaks::Tracker, object::{Object, Version}, - wire::{wp_fifo_manager_v1::*, WpFifoManagerV1Id}, + wire::{WpFifoManagerV1Id, wp_fifo_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_fractional_scale_manager_v1.rs b/src/ifs/wp_fractional_scale_manager_v1.rs index 22a4672f..afc48f53 100644 --- a/src/ifs/wp_fractional_scale_manager_v1.rs +++ b/src/ifs/wp_fractional_scale_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_surface::wp_fractional_scale_v1::{WpFractionalScaleError, WpFractionalScaleV1}, leaks::Tracker, object::{Object, Version}, - wire::{wp_fractional_scale_manager_v1::*, WpFractionalScaleManagerV1Id}, + wire::{WpFractionalScaleManagerV1Id, wp_fractional_scale_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_linux_drm_syncobj_manager_v1.rs b/src/ifs/wp_linux_drm_syncobj_manager_v1.rs index dda9467b..86fdbf41 100644 --- a/src/ifs/wp_linux_drm_syncobj_manager_v1.rs +++ b/src/ifs/wp_linux_drm_syncobj_manager_v1.rs @@ -11,7 +11,7 @@ use { leaks::Tracker, object::{Object, Version}, video::drm::sync_obj::SyncObj, - wire::{wp_linux_drm_syncobj_manager_v1::*, WpLinuxDrmSyncobjManagerV1Id}, + wire::{WpLinuxDrmSyncobjManagerV1Id, wp_linux_drm_syncobj_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_linux_drm_syncobj_timeline_v1.rs b/src/ifs/wp_linux_drm_syncobj_timeline_v1.rs index d3f35765..ad5b7ec1 100644 --- a/src/ifs/wp_linux_drm_syncobj_timeline_v1.rs +++ b/src/ifs/wp_linux_drm_syncobj_timeline_v1.rs @@ -4,7 +4,7 @@ use { leaks::Tracker, object::{Object, Version}, video::drm::sync_obj::SyncObj, - wire::{wp_linux_drm_syncobj_timeline_v1::*, WpLinuxDrmSyncobjTimelineV1Id}, + wire::{WpLinuxDrmSyncobjTimelineV1Id, wp_linux_drm_syncobj_timeline_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_presentation.rs b/src/ifs/wp_presentation.rs index 558f671a..75a337b3 100644 --- a/src/ifs/wp_presentation.rs +++ b/src/ifs/wp_presentation.rs @@ -1,4 +1,4 @@ -pub use crate::wire::{wp_presentation::*, WpPresentationId}; +pub use crate::wire::{WpPresentationId, wp_presentation::*}; use { crate::{ client::{Client, ClientError}, diff --git a/src/ifs/wp_presentation_feedback.rs b/src/ifs/wp_presentation_feedback.rs index 5230f50d..109ed7a3 100644 --- a/src/ifs/wp_presentation_feedback.rs +++ b/src/ifs/wp_presentation_feedback.rs @@ -4,7 +4,7 @@ use { ifs::{wl_output::WlOutput, wl_surface::WlSurface}, leaks::Tracker, object::{Object, Version}, - wire::{wp_presentation_feedback::*, WpPresentationFeedbackId}, + wire::{WpPresentationFeedbackId, wp_presentation_feedback::*}, }, std::{convert::Infallible, rc::Rc}, thiserror::Error, diff --git a/src/ifs/wp_security_context_manager_v1.rs b/src/ifs/wp_security_context_manager_v1.rs index 7ea10332..9c597ca5 100644 --- a/src/ifs/wp_security_context_manager_v1.rs +++ b/src/ifs/wp_security_context_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wp_security_context_v1::WpSecurityContextV1, leaks::Tracker, object::{Object, Version}, - wire::{wp_security_context_manager_v1::*, WpSecurityContextManagerV1Id}, + wire::{WpSecurityContextManagerV1Id, wp_security_context_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_security_context_v1.rs b/src/ifs/wp_security_context_v1.rs index 84ce3041..f0b9ab8d 100644 --- a/src/ifs/wp_security_context_v1.rs +++ b/src/ifs/wp_security_context_v1.rs @@ -1,9 +1,9 @@ use { crate::{ - client::{Client, ClientError, CAPS_DEFAULT_SANDBOXED}, + client::{CAPS_DEFAULT_SANDBOXED, Client, ClientError}, leaks::Tracker, object::{Object, Version}, - wire::{wp_security_context_v1::*, WpSecurityContextV1Id}, + wire::{WpSecurityContextV1Id, wp_security_context_v1::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/ifs/wp_single_pixel_buffer_manager_v1.rs b/src/ifs/wp_single_pixel_buffer_manager_v1.rs index 6a3ba876..007735e3 100644 --- a/src/ifs/wp_single_pixel_buffer_manager_v1.rs +++ b/src/ifs/wp_single_pixel_buffer_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_buffer::WlBuffer, leaks::Tracker, object::{Object, Version}, - wire::{wp_single_pixel_buffer_manager_v1::*, WpSinglePixelBufferManagerV1Id}, + wire::{WpSinglePixelBufferManagerV1Id, wp_single_pixel_buffer_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_tearing_control_manager_v1.rs b/src/ifs/wp_tearing_control_manager_v1.rs index f66263a4..58f2ec9f 100644 --- a/src/ifs/wp_tearing_control_manager_v1.rs +++ b/src/ifs/wp_tearing_control_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::wl_surface::wp_tearing_control_v1::{WpTearingControlV1, WpTearingControlV1Error}, leaks::Tracker, object::{Object, Version}, - wire::{wp_tearing_control_manager_v1::*, WpTearingControlManagerV1Id}, + wire::{WpTearingControlManagerV1Id, wp_tearing_control_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/wp_viewporter.rs b/src/ifs/wp_viewporter.rs index 14eb34ac..cd775238 100644 --- a/src/ifs/wp_viewporter.rs +++ b/src/ifs/wp_viewporter.rs @@ -5,7 +5,7 @@ use { ifs::wl_surface::wp_viewport::{WpViewport, WpViewportError}, leaks::Tracker, object::{Object, Version}, - wire::{wp_viewporter::*, WpViewporterId}, + wire::{WpViewporterId, wp_viewporter::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/xdg_activation_token_v1.rs b/src/ifs/xdg_activation_token_v1.rs index c4ac48fc..9949ca75 100644 --- a/src/ifs/xdg_activation_token_v1.rs +++ b/src/ifs/xdg_activation_token_v1.rs @@ -3,8 +3,8 @@ use { client::{Client, ClientError}, leaks::Tracker, object::{Object, Version}, - utils::activation_token::{activation_token, ActivationToken}, - wire::{xdg_activation_token_v1::*, XdgActivationTokenV1Id}, + utils::activation_token::{ActivationToken, activation_token}, + wire::{XdgActivationTokenV1Id, xdg_activation_token_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/xdg_activation_v1.rs b/src/ifs/xdg_activation_v1.rs index b263e682..f234c3ff 100644 --- a/src/ifs/xdg_activation_v1.rs +++ b/src/ifs/xdg_activation_v1.rs @@ -6,7 +6,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::{activation_token::ActivationToken, errorfmt::ErrorFmt, opaque::OpaqueError}, - wire::{xdg_activation_v1::*, XdgActivationV1Id}, + wire::{XdgActivationV1Id, xdg_activation_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/xdg_positioner.rs b/src/ifs/xdg_positioner.rs index 7a3a066e..36fdb118 100644 --- a/src/ifs/xdg_positioner.rs +++ b/src/ifs/xdg_positioner.rs @@ -5,7 +5,7 @@ use { leaks::Tracker, object::Object, rect::Rect, - wire::{xdg_positioner::*, XdgPositionerId}, + wire::{XdgPositionerId, xdg_positioner::*}, }, std::{cell::RefCell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/xdg_toplevel_drag_manager_v1.rs b/src/ifs/xdg_toplevel_drag_manager_v1.rs index 94dda82e..97eb8a87 100644 --- a/src/ifs/xdg_toplevel_drag_manager_v1.rs +++ b/src/ifs/xdg_toplevel_drag_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::xdg_toplevel_drag_v1::XdgToplevelDragV1, leaks::Tracker, object::{Object, Version}, - wire::{xdg_toplevel_drag_manager_v1::*, XdgToplevelDragManagerV1Id}, + wire::{XdgToplevelDragManagerV1Id, xdg_toplevel_drag_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/xdg_toplevel_drag_v1.rs b/src/ifs/xdg_toplevel_drag_v1.rs index e41f5f25..0aeb09d5 100644 --- a/src/ifs/xdg_toplevel_drag_v1.rs +++ b/src/ifs/xdg_toplevel_drag_v1.rs @@ -11,7 +11,7 @@ use { renderer::Renderer, tree::{Node, ToplevelNode}, utils::clonecell::CloneCell, - wire::{xdg_toplevel_drag_v1::*, XdgToplevelDragV1Id}, + wire::{XdgToplevelDragV1Id, xdg_toplevel_drag_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, diff --git a/src/ifs/xdg_wm_base.rs b/src/ifs/xdg_wm_base.rs index c6bcfb3b..74a05573 100644 --- a/src/ifs/xdg_wm_base.rs +++ b/src/ifs/xdg_wm_base.rs @@ -9,7 +9,7 @@ use { leaks::Tracker, object::{Object, Version}, utils::copyhashmap::CopyHashMap, - wire::{xdg_wm_base::*, XdgSurfaceId, XdgWmBaseId}, + wire::{XdgSurfaceId, XdgWmBaseId, xdg_wm_base::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/xdg_wm_dialog_v1.rs b/src/ifs/xdg_wm_dialog_v1.rs index 75800a38..5adfedf3 100644 --- a/src/ifs/xdg_wm_dialog_v1.rs +++ b/src/ifs/xdg_wm_dialog_v1.rs @@ -7,7 +7,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{xdg_wm_dialog_v1::*, XdgWmDialogV1Id}, + wire::{XdgWmDialogV1Id, xdg_wm_dialog_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zwlr_layer_shell_v1.rs b/src/ifs/zwlr_layer_shell_v1.rs index 348af5ae..53e63178 100644 --- a/src/ifs/zwlr_layer_shell_v1.rs +++ b/src/ifs/zwlr_layer_shell_v1.rs @@ -1,11 +1,11 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_LAYER_SHELL}, + client::{CAP_LAYER_SHELL, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::wl_surface::zwlr_layer_surface_v1::{ZwlrLayerSurfaceV1, ZwlrLayerSurfaceV1Error}, leaks::Tracker, object::{Object, Version}, - wire::{zwlr_layer_shell_v1::*, ZwlrLayerShellV1Id}, + wire::{ZwlrLayerShellV1Id, zwlr_layer_shell_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zwlr_screencopy_frame_v1.rs b/src/ifs/zwlr_screencopy_frame_v1.rs index 41183bd8..982e88ed 100644 --- a/src/ifs/zwlr_screencopy_frame_v1.rs +++ b/src/ifs/zwlr_screencopy_frame_v1.rs @@ -11,7 +11,7 @@ use { object::{Object, Version}, rect::Rect, utils::errorfmt::ErrorFmt, - wire::{zwlr_screencopy_frame_v1::*, WlBufferId, ZwlrScreencopyFrameV1Id}, + wire::{WlBufferId, ZwlrScreencopyFrameV1Id, zwlr_screencopy_frame_v1::*}, }, std::{cell::Cell, ops::Deref, rc::Rc}, thiserror::Error, diff --git a/src/ifs/zwlr_screencopy_manager_v1.rs b/src/ifs/zwlr_screencopy_manager_v1.rs index 66520274..89cb3f70 100644 --- a/src/ifs/zwlr_screencopy_manager_v1.rs +++ b/src/ifs/zwlr_screencopy_manager_v1.rs @@ -1,14 +1,14 @@ use { crate::{ - client::{Client, ClientCaps, ClientError, CAP_SCREENCOPY_MANAGER}, + client::{CAP_SCREENCOPY_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, ifs::zwlr_screencopy_frame_v1::ZwlrScreencopyFrameV1, leaks::Tracker, object::{Object, Version}, rect::Rect, wire::{ - zwlr_screencopy_manager_v1::*, WlOutputId, ZwlrScreencopyFrameV1Id, - ZwlrScreencopyManagerV1Id, + WlOutputId, ZwlrScreencopyFrameV1Id, ZwlrScreencopyManagerV1Id, + zwlr_screencopy_manager_v1::*, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/ifs/zwp_idle_inhibit_manager_v1.rs b/src/ifs/zwp_idle_inhibit_manager_v1.rs index c3bf27ff..71884fc9 100644 --- a/src/ifs/zwp_idle_inhibit_manager_v1.rs +++ b/src/ifs/zwp_idle_inhibit_manager_v1.rs @@ -8,7 +8,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_idle_inhibit_manager_v1::*, ZwpIdleInhibitManagerV1Id}, + wire::{ZwpIdleInhibitManagerV1Id, zwp_idle_inhibit_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zwp_linux_buffer_params_v1.rs b/src/ifs/zwp_linux_buffer_params_v1.rs index 772da4fd..cfff2d97 100644 --- a/src/ifs/zwp_linux_buffer_params_v1.rs +++ b/src/ifs/zwp_linux_buffer_params_v1.rs @@ -6,8 +6,8 @@ use { leaks::Tracker, object::Object, utils::{errorfmt::ErrorFmt, hash_map_ext::HashMapExt}, - video::dmabuf::{DmaBuf, DmaBufPlane, PlaneVec, MAX_PLANES}, - wire::{zwp_linux_buffer_params_v1::*, WlBufferId, ZwpLinuxBufferParamsV1Id}, + video::dmabuf::{DmaBuf, DmaBufPlane, MAX_PLANES, PlaneVec}, + wire::{WlBufferId, ZwpLinuxBufferParamsV1Id, zwp_linux_buffer_params_v1::*}, }, ahash::AHashMap, std::{ @@ -136,7 +136,7 @@ impl ZwpLinuxBufferParamsV1RequestHandler for ZwpLinuxBufferParamsV1 { let modifier = ((req.modifier_hi as u64) << 32) | req.modifier_lo as u64; match self.modifier.get() { Some(m) if m != modifier => { - return Err(ZwpLinuxBufferParamsV1Error::MixedModifiers(modifier, m)) + return Err(ZwpLinuxBufferParamsV1Error::MixedModifiers(modifier, m)); } _ => self.modifier.set(Some(modifier)), } diff --git a/src/ifs/zwp_linux_dmabuf_feedback_v1.rs b/src/ifs/zwp_linux_dmabuf_feedback_v1.rs index a8be2da8..5c8be77f 100644 --- a/src/ifs/zwp_linux_dmabuf_feedback_v1.rs +++ b/src/ifs/zwp_linux_dmabuf_feedback_v1.rs @@ -5,11 +5,11 @@ use { ifs::wl_surface::WlSurface, leaks::Tracker, object::{Object, Version}, - wire::{zwp_linux_dmabuf_feedback_v1::*, ZwpLinuxDmabufFeedbackV1Id}, + wire::{ZwpLinuxDmabufFeedbackV1Id, zwp_linux_dmabuf_feedback_v1::*}, }, std::{cell::Cell, rc::Rc}, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub const SCANOUT: u32 = 1; diff --git a/src/ifs/zwp_linux_dmabuf_v1.rs b/src/ifs/zwp_linux_dmabuf_v1.rs index 5dd63a64..5812022d 100644 --- a/src/ifs/zwp_linux_dmabuf_v1.rs +++ b/src/ifs/zwp_linux_dmabuf_v1.rs @@ -8,7 +8,7 @@ use { }, leaks::Tracker, object::{Object, Version}, - wire::{zwp_linux_dmabuf_v1::*, ZwpLinuxDmabufFeedbackV1Id, ZwpLinuxDmabufV1Id}, + wire::{ZwpLinuxDmabufFeedbackV1Id, ZwpLinuxDmabufV1Id, zwp_linux_dmabuf_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zxdg_decoration_manager_v1.rs b/src/ifs/zxdg_decoration_manager_v1.rs index c4ce9c76..ad62071d 100644 --- a/src/ifs/zxdg_decoration_manager_v1.rs +++ b/src/ifs/zxdg_decoration_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, leaks::Tracker, object::{Object, Version}, - wire::{zxdg_decoration_manager_v1::*, ZxdgDecorationManagerV1Id}, + wire::{ZxdgDecorationManagerV1Id, zxdg_decoration_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zxdg_output_manager_v1.rs b/src/ifs/zxdg_output_manager_v1.rs index f7225e64..fd64a128 100644 --- a/src/ifs/zxdg_output_manager_v1.rs +++ b/src/ifs/zxdg_output_manager_v1.rs @@ -5,7 +5,7 @@ use { ifs::zxdg_output_v1::ZxdgOutputV1, leaks::Tracker, object::{Object, Version}, - wire::{zxdg_output_manager_v1::*, ZxdgOutputManagerV1Id}, + wire::{ZxdgOutputManagerV1Id, zxdg_output_manager_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zxdg_output_v1.rs b/src/ifs/zxdg_output_v1.rs index 6a45fd7e..f33103dc 100644 --- a/src/ifs/zxdg_output_v1.rs +++ b/src/ifs/zxdg_output_v1.rs @@ -1,10 +1,10 @@ use { crate::{ client::{Client, ClientError}, - ifs::wl_output::{WlOutput, SEND_DONE_SINCE}, + ifs::wl_output::{SEND_DONE_SINCE, WlOutput}, leaks::Tracker, object::{Object, Version}, - wire::{zxdg_output_v1::*, ZxdgOutputV1Id}, + wire::{ZxdgOutputV1Id, zxdg_output_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/ifs/zxdg_toplevel_decoration_v1.rs b/src/ifs/zxdg_toplevel_decoration_v1.rs index 21e61246..a4223811 100644 --- a/src/ifs/zxdg_toplevel_decoration_v1.rs +++ b/src/ifs/zxdg_toplevel_decoration_v1.rs @@ -4,7 +4,7 @@ use { ifs::wl_surface::xdg_surface::xdg_toplevel::{Decoration, XdgToplevel}, leaks::Tracker, object::{Object, Version}, - wire::{zxdg_toplevel_decoration_v1::*, ZxdgToplevelDecorationV1Id}, + wire::{ZxdgToplevelDecorationV1Id, zxdg_toplevel_decoration_v1::*}, }, std::rc::Rc, thiserror::Error, diff --git a/src/io_uring.rs b/src/io_uring.rs index 1204600e..4783d7d6 100644 --- a/src/io_uring.rs +++ b/src/io_uring.rs @@ -1,7 +1,7 @@ pub use ops::{ + TaskResultExt, poll_external::{PendingPoll, PollCallback}, timeout_external::{PendingTimeout, TimeoutCallback}, - TaskResultExt, }; use { crate::{ @@ -16,9 +16,9 @@ use { }, pending_result::PendingResults, sys::{ - io_uring_cqe, io_uring_enter, io_uring_params, io_uring_setup, io_uring_sqe, - IORING_ENTER_GETEVENTS, IORING_FEAT_NODROP, IORING_OFF_CQ_RING, IORING_OFF_SQES, - IORING_OFF_SQ_RING, IOSQE_IO_LINK, + IORING_ENTER_GETEVENTS, IORING_FEAT_NODROP, IORING_OFF_CQ_RING, IORING_OFF_SQ_RING, + IORING_OFF_SQES, IOSQE_IO_LINK, io_uring_cqe, io_uring_enter, io_uring_params, + io_uring_setup, io_uring_sqe, }, }, utils::{ @@ -27,7 +27,7 @@ use { buf::Buf, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, - mmap::{mmap, Mmapped}, + mmap::{Mmapped, mmap}, oserror::OsError, ptr_ext::{MutPtrExt, PtrExt}, stack::Stack, @@ -44,8 +44,8 @@ use { }, thiserror::Error, uapi::{ - c::{self}, OwnedFd, + c::{self}, }, }; diff --git a/src/io_uring/ops/accept.rs b/src/io_uring/ops/accept.rs index 149592ea..0acee0d5 100644 --- a/src/io_uring/ops/accept.rs +++ b/src/io_uring/ops/accept.rs @@ -1,11 +1,11 @@ use { crate::io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_ACCEPT}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, + pending_result::PendingResult, + sys::{IORING_OP_ACCEPT, io_uring_sqe}, }, std::rc::Rc, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/async_cancel.rs b/src/io_uring/ops/async_cancel.rs index 3874ab98..f21e7024 100644 --- a/src/io_uring/ops/async_cancel.rs +++ b/src/io_uring/ops/async_cancel.rs @@ -1,8 +1,8 @@ use { crate::{ io_uring::{ - sys::{io_uring_sqe, IORING_OP_ASYNC_CANCEL}, IoUringData, IoUringTaskId, Task, + sys::{IORING_OP_ASYNC_CANCEL, io_uring_sqe}, }, utils::errorfmt::ErrorFmt, }, diff --git a/src/io_uring/ops/connect.rs b/src/io_uring/ops/connect.rs index 1ba13c86..cfb89039 100644 --- a/src/io_uring/ops/connect.rs +++ b/src/io_uring/ops/connect.rs @@ -1,11 +1,11 @@ use { crate::io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_CONNECT}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, + pending_result::PendingResult, + sys::{IORING_OP_CONNECT, io_uring_sqe}, }, std::{ptr, rc::Rc}, - uapi::{c, OwnedFd, SockAddr}, + uapi::{OwnedFd, SockAddr, c}, }; impl IoUring { diff --git a/src/io_uring/ops/poll.rs b/src/io_uring/ops/poll.rs index 1ac45281..01e77679 100644 --- a/src/io_uring/ops/poll.rs +++ b/src/io_uring/ops/poll.rs @@ -1,12 +1,12 @@ use { crate::io_uring::{ + IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, ops::TaskResult, pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_POLL_ADD}, - IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, + sys::{IORING_OP_POLL_ADD, io_uring_sqe}, }, std::rc::Rc, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/poll_external.rs b/src/io_uring/ops/poll_external.rs index d17440a0..6a86a125 100644 --- a/src/io_uring/ops/poll_external.rs +++ b/src/io_uring/ops/poll_external.rs @@ -1,13 +1,13 @@ use { crate::{ io_uring::{ - sys::{io_uring_sqe, IORING_OP_POLL_ADD}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, + sys::{IORING_OP_POLL_ADD, io_uring_sqe}, }, utils::oserror::OsError, }, std::{cell::Cell, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub trait PollCallback { diff --git a/src/io_uring/ops/read_write.rs b/src/io_uring/ops/read_write.rs index f8db92cb..ddece5a3 100644 --- a/src/io_uring/ops/read_write.rs +++ b/src/io_uring/ops/read_write.rs @@ -1,15 +1,15 @@ use { crate::{ io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_READ, IORING_OP_WRITE}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, + pending_result::PendingResult, + sys::{IORING_OP_READ, IORING_OP_WRITE, io_uring_sqe}, }, time::Time, utils::buf::Buf, }, std::rc::Rc, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/read_write_no_cancel.rs b/src/io_uring/ops/read_write_no_cancel.rs index 02cc2107..bbce28b9 100644 --- a/src/io_uring/ops/read_write_no_cancel.rs +++ b/src/io_uring/ops/read_write_no_cancel.rs @@ -4,14 +4,14 @@ mod tests; use { crate::{ io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_READ, IORING_OP_WRITE}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, TaskResultExt, + pending_result::PendingResult, + sys::{IORING_OP_READ, IORING_OP_WRITE, io_uring_sqe}, }, time::Time, utils::on_drop::OnDrop, }, - uapi::{c, Fd}, + uapi::{Fd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/recvmsg.rs b/src/io_uring/ops/recvmsg.rs index 6bea0d09..1c7e4f81 100644 --- a/src/io_uring/ops/recvmsg.rs +++ b/src/io_uring/ops/recvmsg.rs @@ -1,14 +1,14 @@ use { crate::{ io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_RECVMSG}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, + pending_result::PendingResult, + sys::{IORING_OP_RECVMSG, io_uring_sqe}, }, utils::buf::Buf, }, std::{cell::Cell, collections::VecDeque, mem::MaybeUninit, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/sendmsg.rs b/src/io_uring/ops/sendmsg.rs index 3ca19ef2..8d495a7e 100644 --- a/src/io_uring/ops/sendmsg.rs +++ b/src/io_uring/ops/sendmsg.rs @@ -1,15 +1,15 @@ use { crate::{ io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_SENDMSG}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, + pending_result::PendingResult, + sys::{IORING_OP_SENDMSG, io_uring_sqe}, }, time::Time, utils::{buf::Buf, vec_ext::UninitVecExt}, }, std::{mem::MaybeUninit, ptr, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; impl IoUring { diff --git a/src/io_uring/ops/timeout.rs b/src/io_uring/ops/timeout.rs index e8067c61..d7e0c2fb 100644 --- a/src/io_uring/ops/timeout.rs +++ b/src/io_uring/ops/timeout.rs @@ -1,8 +1,8 @@ use { crate::io_uring::{ - pending_result::PendingResult, - sys::{io_uring_sqe, IORING_OP_TIMEOUT, IORING_TIMEOUT_ABS}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, + pending_result::PendingResult, + sys::{IORING_OP_TIMEOUT, IORING_TIMEOUT_ABS, io_uring_sqe}, }, uapi::c, }; diff --git a/src/io_uring/ops/timeout_external.rs b/src/io_uring/ops/timeout_external.rs index cb7269ac..860811de 100644 --- a/src/io_uring/ops/timeout_external.rs +++ b/src/io_uring/ops/timeout_external.rs @@ -1,9 +1,9 @@ use { crate::{ io_uring::{ - ops::timeout::timespec64, - sys::{io_uring_sqe, IORING_OP_TIMEOUT, IORING_TIMEOUT_ABS}, IoUring, IoUringData, IoUringError, IoUringTaskId, Task, + ops::timeout::timespec64, + sys::{IORING_OP_TIMEOUT, IORING_TIMEOUT_ABS, io_uring_sqe}, }, utils::oserror::OsError, }, diff --git a/src/io_uring/ops/timeout_link.rs b/src/io_uring/ops/timeout_link.rs index 023fbd99..edb9faa4 100644 --- a/src/io_uring/ops/timeout_link.rs +++ b/src/io_uring/ops/timeout_link.rs @@ -1,8 +1,8 @@ use crate::{ io_uring::{ - ops::timeout::timespec64, - sys::{io_uring_sqe, IORING_OP_LINK_TIMEOUT, IORING_TIMEOUT_ABS}, IoUring, IoUringData, IoUringTaskId, Task, + ops::timeout::timespec64, + sys::{IORING_OP_LINK_TIMEOUT, IORING_TIMEOUT_ABS, io_uring_sqe}, }, time::Time, }; diff --git a/src/io_uring/sys.rs b/src/io_uring/sys.rs index f1a184ba..4666670a 100644 --- a/src/io_uring/sys.rs +++ b/src/io_uring/sys.rs @@ -3,7 +3,7 @@ use { crate::utils::oserror::OsError, std::mem::MaybeUninit, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[repr(C)] diff --git a/src/it.rs b/src/it.rs index 3730fd45..f91dd4d4 100644 --- a/src/it.rs +++ b/src/it.rs @@ -3,7 +3,7 @@ use { async_engine::Phase, it::{ test_backend::TestBackend, - test_config::{with_test_config, TestConfig}, + test_config::{TestConfig, with_test_config}, testrun::TestRun, tests::TestCase, }, @@ -75,14 +75,16 @@ fn run_tests_(tests: Vec<&'static dyn TestCase>) { for _ in 0..num_cpus { let queue = queue.clone(); let it_run = it_run.clone(); - threads.push(std::thread::spawn(move || loop { - let test = match queue.lock().pop_front() { - Some(t) => t, - _ => break, - }; - with_test_config(|cfg| { - run_test(&it_run, test, cfg); - }) + threads.push(std::thread::spawn(move || { + loop { + let test = match queue.lock().pop_front() { + Some(t) => t, + _ => break, + }; + with_test_config(|cfg| { + run_test(&it_run, test, cfg); + }) + } })); } for thread in threads { diff --git a/src/it/test_backend.rs b/src/it/test_backend.rs index 62ac58d0..1afd78ad 100644 --- a/src/it/test_backend.rs +++ b/src/it/test_backend.rs @@ -263,7 +263,7 @@ where return Err(TestBackendError::OpenDrmNode( node.as_os_str().as_bytes().as_bstr().to_string(), e.into(), - )) + )); } }; let drm = Drm::open_existing(file).map_err(TestBackendError::OpenDrmDevice)?; diff --git a/src/it/test_client.rs b/src/it/test_client.rs index 5e70ec9e..849344ad 100644 --- a/src/it/test_client.rs +++ b/src/it/test_client.rs @@ -1,6 +1,6 @@ use { crate::{ - cli::{screenshot::buf_to_bytes, ScreenshotFormat}, + cli::{ScreenshotFormat, screenshot::buf_to_bytes}, client::Client, globals::GlobalBase, it::{ diff --git a/src/it/test_config.rs b/src/it/test_config.rs index 728bd949..2391b886 100644 --- a/src/it/test_config.rs +++ b/src/it/test_config.rs @@ -10,14 +10,13 @@ use { isnt::std_1::primitive::IsntConstPtrExt, jay_config::{ _private::{ - bincode_ops, + ConfigEntry, VERSION, bincode_ops, ipc::{ClientMessage, Response, ServerMessage}, - ConfigEntry, VERSION, }, + Axis, Direction, input::{InputDevice, Seat}, keyboard::{Keymap, ModifiedKeySym}, video::{Connector, Transform}, - Axis, Direction, }, std::{cell::Cell, ops::Deref, ptr, rc::Rc, time::Duration}, }; diff --git a/src/it/test_gfx_api.rs b/src/it/test_gfx_api.rs index ce81814b..0ec94b1d 100644 --- a/src/it/test_gfx_api.rs +++ b/src/it/test_gfx_api.rs @@ -2,7 +2,7 @@ use { crate::{ allocator::{Allocator, AllocatorError, BufferObject, BufferUsage}, cpu_worker::CpuWorker, - format::{Format, ARGB8888, XRGB8888}, + format::{ARGB8888, Format, XRGB8888}, gfx_api::{ AcquireSync, AsyncShmGfxTexture, AsyncShmGfxTextureCallback, CopyTexture, FillRect, FramebufferRect, GfxApiOpt, GfxContext, GfxError, GfxFormat, GfxFramebuffer, GfxImage, @@ -11,7 +11,7 @@ use { }, rect::{Rect, Region}, theme::Color, - video::{dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx, LINEAR_MODIFIER}, + video::{LINEAR_MODIFIER, dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx}, }, ahash::AHashMap, indexmap::IndexSet, diff --git a/src/it/test_ifs/test_alpha_modifier.rs b/src/it/test_ifs/test_alpha_modifier.rs index 242c1b28..5e6d557a 100644 --- a/src/it/test_ifs/test_alpha_modifier.rs +++ b/src/it/test_ifs/test_alpha_modifier.rs @@ -8,7 +8,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{wp_alpha_modifier_v1::*, WpAlphaModifierV1Id}, + wire::{WpAlphaModifierV1Id, wp_alpha_modifier_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_alpha_modifier_surface.rs b/src/it/test_ifs/test_alpha_modifier_surface.rs index 6463f7a0..15fb712d 100644 --- a/src/it/test_ifs/test_alpha_modifier_surface.rs +++ b/src/it/test_ifs/test_alpha_modifier_surface.rs @@ -1,7 +1,7 @@ use { crate::{ it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{wp_alpha_modifier_surface_v1::*, WpAlphaModifierSurfaceV1Id}, + wire::{WpAlphaModifierSurfaceV1Id, wp_alpha_modifier_surface_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_buffer.rs b/src/it/test_ifs/test_buffer.rs index 8ed6fa6b..41654a71 100644 --- a/src/it/test_ifs/test_buffer.rs +++ b/src/it/test_ifs/test_buffer.rs @@ -5,7 +5,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_buffer::*, WlBufferId}, + wire::{WlBufferId, wl_buffer::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_callback.rs b/src/it/test_ifs/test_callback.rs index 81a04bce..ec47c53c 100644 --- a/src/it/test_ifs/test_callback.rs +++ b/src/it/test_ifs/test_callback.rs @@ -5,7 +5,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_callback::*, WlCallbackId}, + wire::{WlCallbackId, wl_callback::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_compositor.rs b/src/it/test_ifs/test_compositor.rs index f8512a79..9c0fd2d6 100644 --- a/src/it/test_ifs/test_compositor.rs +++ b/src/it/test_ifs/test_compositor.rs @@ -7,8 +7,8 @@ use { test_transport::TestTransport, }, wire::{ - wl_compositor::{CreateRegion, CreateSurface}, WlCompositorId, + wl_compositor::{CreateRegion, CreateSurface}, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/it/test_ifs/test_content_type.rs b/src/it/test_ifs/test_content_type.rs index 541f3ac8..1063dee7 100644 --- a/src/it/test_ifs/test_content_type.rs +++ b/src/it/test_ifs/test_content_type.rs @@ -1,7 +1,7 @@ use { crate::{ it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{wp_content_type_v1::*, WpContentTypeV1Id}, + wire::{WpContentTypeV1Id, wp_content_type_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_content_type_manager.rs b/src/it/test_ifs/test_content_type_manager.rs index 5089c56e..2e8f004d 100644 --- a/src/it/test_ifs/test_content_type_manager.rs +++ b/src/it/test_ifs/test_content_type_manager.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{wp_content_type_manager_v1::*, WpContentTypeManagerV1Id}, + wire::{WpContentTypeManagerV1Id, wp_content_type_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_cursor_shape_device.rs b/src/it/test_ifs/test_cursor_shape_device.rs index f553e9f4..ce5261cd 100644 --- a/src/it/test_ifs/test_cursor_shape_device.rs +++ b/src/it/test_ifs/test_cursor_shape_device.rs @@ -1,7 +1,7 @@ use { crate::{ it::{test_error::TestResult, test_object::TestObject, test_transport::TestTransport}, - wire::{wp_cursor_shape_device_v1::*, WpCursorShapeDeviceV1Id}, + wire::{WpCursorShapeDeviceV1Id, wp_cursor_shape_device_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_cursor_shape_manager.rs b/src/it/test_ifs/test_cursor_shape_manager.rs index c7ed66eb..63ffeab3 100644 --- a/src/it/test_ifs/test_cursor_shape_manager.rs +++ b/src/it/test_ifs/test_cursor_shape_manager.rs @@ -8,7 +8,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{wp_cursor_shape_manager_v1::*, WpCursorShapeManagerV1Id}, + wire::{WpCursorShapeManagerV1Id, wp_cursor_shape_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_data_control_device.rs b/src/it/test_ifs/test_data_control_device.rs index 883badf3..677e4aa5 100644 --- a/src/it/test_ifs/test_data_control_device.rs +++ b/src/it/test_ifs/test_data_control_device.rs @@ -13,7 +13,7 @@ use { }, utils::{buffd::MsgParser, copyhashmap::CopyHashMap}, wire::{ - zwlr_data_control_device_v1::*, ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, + ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, zwlr_data_control_device_v1::*, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/it/test_ifs/test_data_control_manager.rs b/src/it/test_ifs/test_data_control_manager.rs index 197b1d19..82ca132e 100644 --- a/src/it/test_ifs/test_data_control_manager.rs +++ b/src/it/test_ifs/test_data_control_manager.rs @@ -9,7 +9,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{zwlr_data_control_manager_v1::*, ZwlrDataControlManagerV1Id}, + wire::{ZwlrDataControlManagerV1Id, zwlr_data_control_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_data_control_offer.rs b/src/it/test_ifs/test_data_control_offer.rs index dfb6d4fd..1e291d19 100644 --- a/src/it/test_ifs/test_data_control_offer.rs +++ b/src/it/test_ifs/test_data_control_offer.rs @@ -7,14 +7,14 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{zwlr_data_control_offer_v1::*, ZwlrDataControlOfferV1Id}, + wire::{ZwlrDataControlOfferV1Id, zwlr_data_control_offer_v1::*}, }, ahash::AHashSet, std::{ cell::{Cell, RefCell}, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub struct TestDataControlOffer { diff --git a/src/it/test_ifs/test_data_control_source.rs b/src/it/test_ifs/test_data_control_source.rs index 6274d1f5..8699b9dd 100644 --- a/src/it/test_ifs/test_data_control_source.rs +++ b/src/it/test_ifs/test_data_control_source.rs @@ -8,7 +8,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{zwlr_data_control_source_v1::*, ZwlrDataControlSourceV1Id}, + wire::{ZwlrDataControlSourceV1Id, zwlr_data_control_source_v1::*}, }, std::{cell::Cell, rc::Rc}, uapi::OwnedFd, diff --git a/src/it/test_ifs/test_data_device.rs b/src/it/test_ifs/test_data_device.rs index 9022f3fe..d16ae898 100644 --- a/src/it/test_ifs/test_data_device.rs +++ b/src/it/test_ifs/test_data_device.rs @@ -11,7 +11,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_data_device::*, WlDataDeviceId, WlSurfaceId}, + wire::{WlDataDeviceId, WlSurfaceId, wl_data_device::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_data_device_manager.rs b/src/it/test_ifs/test_data_device_manager.rs index 59dcc8a1..87435190 100644 --- a/src/it/test_ifs/test_data_device_manager.rs +++ b/src/it/test_ifs/test_data_device_manager.rs @@ -9,7 +9,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{wl_data_device_manager::*, WlDataDeviceManagerId}, + wire::{WlDataDeviceManagerId, wl_data_device_manager::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_data_offer.rs b/src/it/test_ifs/test_data_offer.rs index 508048bb..562849c5 100644 --- a/src/it/test_ifs/test_data_offer.rs +++ b/src/it/test_ifs/test_data_offer.rs @@ -5,7 +5,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_data_offer::*, WlDataOfferId}, + wire::{WlDataOfferId, wl_data_offer::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_data_source.rs b/src/it/test_ifs/test_data_source.rs index 00175412..357d4ad3 100644 --- a/src/it/test_ifs/test_data_source.rs +++ b/src/it/test_ifs/test_data_source.rs @@ -5,7 +5,7 @@ use { test_utils::test_expected_event::TEEH, testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_data_source::*, WlDataSourceId}, + wire::{WlDataSourceId, wl_data_source::*}, }, std::{cell::Cell, rc::Rc}, uapi::OwnedFd, diff --git a/src/it/test_ifs/test_display.rs b/src/it/test_ifs/test_display.rs index e71d5c81..8aca0de9 100644 --- a/src/it/test_ifs/test_display.rs +++ b/src/it/test_ifs/test_display.rs @@ -7,7 +7,7 @@ use { }, object::ObjectId, utils::buffd::MsgParser, - wire::{wl_display::*, WlDisplayId}, + wire::{WlDisplayId, wl_display::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_dmabuf.rs b/src/it/test_ifs/test_dmabuf.rs index 8323d5c0..a0cf3d43 100644 --- a/src/it/test_ifs/test_dmabuf.rs +++ b/src/it/test_ifs/test_dmabuf.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{zwp_linux_dmabuf_v1::*, ZwpLinuxDmabufV1Id}, + wire::{ZwpLinuxDmabufV1Id, zwp_linux_dmabuf_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_dmabuf_feedback.rs b/src/it/test_ifs/test_dmabuf_feedback.rs index 92271354..a8092186 100644 --- a/src/it/test_ifs/test_dmabuf_feedback.rs +++ b/src/it/test_ifs/test_dmabuf_feedback.rs @@ -5,7 +5,7 @@ use { test_utils::test_expected_event::TEEH, testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{zwp_linux_dmabuf_feedback_v1::*, ZwpLinuxDmabufFeedbackV1Id}, + wire::{ZwpLinuxDmabufFeedbackV1Id, zwp_linux_dmabuf_feedback_v1::*}, }, std::{ cell::{Cell, RefCell}, @@ -13,7 +13,7 @@ use { ops::DerefMut, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub struct TestDmabufFeedback { diff --git a/src/it/test_ifs/test_ext_foreign_toplevel_handle.rs b/src/it/test_ifs/test_ext_foreign_toplevel_handle.rs index a2d0127b..09ca08dc 100644 --- a/src/it/test_ifs/test_ext_foreign_toplevel_handle.rs +++ b/src/it/test_ifs/test_ext_foreign_toplevel_handle.rs @@ -7,7 +7,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{ext_foreign_toplevel_handle_v1::*, ExtForeignToplevelHandleV1Id}, + wire::{ExtForeignToplevelHandleV1Id, ext_foreign_toplevel_handle_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_ext_foreign_toplevel_list.rs b/src/it/test_ifs/test_ext_foreign_toplevel_list.rs index bfd2784d..5d86189d 100644 --- a/src/it/test_ifs/test_ext_foreign_toplevel_list.rs +++ b/src/it/test_ifs/test_ext_foreign_toplevel_list.rs @@ -8,7 +8,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{ext_foreign_toplevel_list_v1::*, ExtForeignToplevelListV1Id}, + wire::{ExtForeignToplevelListV1Id, ext_foreign_toplevel_list_v1::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/it/test_ifs/test_input_method.rs b/src/it/test_ifs/test_input_method.rs index 9a929bae..234c9d47 100644 --- a/src/it/test_ifs/test_input_method.rs +++ b/src/it/test_ifs/test_input_method.rs @@ -12,7 +12,7 @@ use { testrun::ParseFull, }, utils::{buffd::MsgParser, numcell::NumCell}, - wire::{zwp_input_method_v2::*, ZwpInputMethodV2Id}, + wire::{ZwpInputMethodV2Id, zwp_input_method_v2::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_input_method_keyboard_grab.rs b/src/it/test_ifs/test_input_method_keyboard_grab.rs index 7a486081..82e387e7 100644 --- a/src/it/test_ifs/test_input_method_keyboard_grab.rs +++ b/src/it/test_ifs/test_input_method_keyboard_grab.rs @@ -5,7 +5,7 @@ use { test_utils::test_expected_event::TEEH, testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{zwp_input_method_keyboard_grab_v2::*, ZwpInputMethodKeyboardGrabV2Id}, + wire::{ZwpInputMethodKeyboardGrabV2Id, zwp_input_method_keyboard_grab_v2::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_input_method_manager.rs b/src/it/test_ifs/test_input_method_manager.rs index 2dd031d7..c3e7cd6e 100644 --- a/src/it/test_ifs/test_input_method_manager.rs +++ b/src/it/test_ifs/test_input_method_manager.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{zwp_input_method_manager_v2::GetInputMethod, ZwpInputMethodManagerV2Id}, + wire::{ZwpInputMethodManagerV2Id, zwp_input_method_manager_v2::GetInputMethod}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_input_popup_surface.rs b/src/it/test_ifs/test_input_popup_surface.rs index c97f2606..4ccb4c79 100644 --- a/src/it/test_ifs/test_input_popup_surface.rs +++ b/src/it/test_ifs/test_input_popup_surface.rs @@ -1,7 +1,7 @@ use { crate::{ it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{zwp_input_popup_surface_v2::*, ZwpInputPopupSurfaceV2Id}, + wire::{ZwpInputPopupSurfaceV2Id, zwp_input_popup_surface_v2::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_jay_compositor.rs b/src/it/test_ifs/test_jay_compositor.rs index 9e57540b..29a4150d 100644 --- a/src/it/test_ifs/test_jay_compositor.rs +++ b/src/it/test_ifs/test_jay_compositor.rs @@ -11,8 +11,8 @@ use { utils::{buffd::MsgParser, cell_ext::CellExt}, video::dmabuf::DmaBuf, wire::{ - jay_compositor::{self, *}, JayCompositorId, + jay_compositor::{self, *}, }, }, std::{cell::Cell, rc::Rc}, diff --git a/src/it/test_ifs/test_keyboard.rs b/src/it/test_ifs/test_keyboard.rs index a37c5c27..ebeffade 100644 --- a/src/it/test_ifs/test_keyboard.rs +++ b/src/it/test_ifs/test_keyboard.rs @@ -6,7 +6,7 @@ use { test_utils::test_expected_event::TEEH, testrun::ParseFull, }, utils::{buffd::MsgParser, clonecell::CloneCell, numcell::NumCell, once::Once}, - wire::{wl_keyboard::*, WlKeyboardId, WlSurfaceId}, + wire::{WlKeyboardId, WlSurfaceId, wl_keyboard::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_pointer.rs b/src/it/test_ifs/test_pointer.rs index e602316e..f68ad537 100644 --- a/src/it/test_ifs/test_pointer.rs +++ b/src/it/test_ifs/test_pointer.rs @@ -7,7 +7,7 @@ use { testrun::ParseFull, }, utils::{buffd::MsgParser, clonecell::CloneCell}, - wire::{wl_pointer::*, WlPointerId, WlSurfaceId}, + wire::{WlPointerId, WlSurfaceId, wl_pointer::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_region.rs b/src/it/test_ifs/test_region.rs index aa7f5d6e..c2a0aec2 100644 --- a/src/it/test_ifs/test_region.rs +++ b/src/it/test_ifs/test_region.rs @@ -3,7 +3,7 @@ use { ifs::wl_region::WlRegion, it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, rect::{Rect, RegionBuilder}, - wire::{wl_region::*, WlRegionId}, + wire::{WlRegionId, wl_region::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/it/test_ifs/test_registry.rs b/src/it/test_ifs/test_registry.rs index b3249723..cb012784 100644 --- a/src/it/test_ifs/test_registry.rs +++ b/src/it/test_ifs/test_registry.rs @@ -27,7 +27,7 @@ use { testrun::ParseFull, }, utils::{buffd::MsgParser, clonecell::CloneCell, copyhashmap::CopyHashMap}, - wire::{wl_registry::*, WlRegistryId, WlSeat}, + wire::{WlRegistryId, WlSeat, wl_registry::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_screenshot.rs b/src/it/test_ifs/test_screenshot.rs index e1ccc1d7..f4c70a4d 100644 --- a/src/it/test_ifs/test_screenshot.rs +++ b/src/it/test_ifs/test_screenshot.rs @@ -5,7 +5,7 @@ use { state::State, utils::buffd::MsgParser, video::dmabuf::{DmaBuf, DmaBufPlane, PlaneVec}, - wire::{jay_screenshot::*, JayScreenshotId}, + wire::{JayScreenshotId, jay_screenshot::*}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/it/test_ifs/test_seat.rs b/src/it/test_ifs/test_seat.rs index 57fba76e..1d329944 100644 --- a/src/it/test_ifs/test_seat.rs +++ b/src/it/test_ifs/test_seat.rs @@ -9,7 +9,7 @@ use { testrun::ParseFull, }, utils::{buffd::MsgParser, clonecell::CloneCell, once::Once}, - wire::{wl_seat::*, WlSeatId}, + wire::{WlSeatId, wl_seat::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_shm.rs b/src/it/test_ifs/test_shm.rs index a2a4e97b..b90d4bd6 100644 --- a/src/it/test_ifs/test_shm.rs +++ b/src/it/test_ifs/test_shm.rs @@ -10,7 +10,7 @@ use { testrun::ParseFull, }, utils::{buffd::MsgParser, clonecell::CloneCell, copyhashmap::CopyHashMap}, - wire::{wl_shm::*, WlShmId}, + wire::{WlShmId, wl_shm::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_shm_pool.rs b/src/it/test_ifs/test_shm_pool.rs index 4c4aaec0..5c7554b7 100644 --- a/src/it/test_ifs/test_shm_pool.rs +++ b/src/it/test_ifs/test_shm_pool.rs @@ -9,7 +9,7 @@ use { test_transport::TestTransport, }, utils::clonecell::CloneCell, - wire::{wl_shm_pool::*, WlShmPoolId}, + wire::{WlShmPoolId, wl_shm_pool::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_single_pixel_buffer_manager.rs b/src/it/test_ifs/test_single_pixel_buffer_manager.rs index cd49b701..ed097aef 100644 --- a/src/it/test_ifs/test_single_pixel_buffer_manager.rs +++ b/src/it/test_ifs/test_single_pixel_buffer_manager.rs @@ -5,7 +5,7 @@ use { test_transport::TestTransport, }, theme::Color, - wire::{wp_single_pixel_buffer_manager_v1::*, WpSinglePixelBufferManagerV1Id}, + wire::{WpSinglePixelBufferManagerV1Id, wp_single_pixel_buffer_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_subcompositor.rs b/src/it/test_ifs/test_subcompositor.rs index 2e0302c6..5ef72632 100644 --- a/src/it/test_ifs/test_subcompositor.rs +++ b/src/it/test_ifs/test_subcompositor.rs @@ -4,7 +4,7 @@ use { test_error::TestError, test_ifs::test_subsurface::TestSubsurface, test_object::TestObject, test_transport::TestTransport, }, - wire::{wl_subcompositor::*, WlSubcompositorId, WlSurfaceId}, + wire::{WlSubcompositorId, WlSurfaceId, wl_subcompositor::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_subsurface.rs b/src/it/test_ifs/test_subsurface.rs index fd1cd051..bd0a3432 100644 --- a/src/it/test_ifs/test_subsurface.rs +++ b/src/it/test_ifs/test_subsurface.rs @@ -2,7 +2,7 @@ use { crate::{ ifs::wl_surface::wl_subsurface::WlSubsurface, it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{wl_subsurface::*, WlSubsurfaceId, WlSurfaceId}, + wire::{WlSubsurfaceId, WlSurfaceId, wl_subsurface::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_surface.rs b/src/it/test_ifs/test_surface.rs index 07534566..ea828b4d 100644 --- a/src/it/test_ifs/test_surface.rs +++ b/src/it/test_ifs/test_surface.rs @@ -10,7 +10,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{wl_surface::*, WlBufferId, WlSurfaceId}, + wire::{WlBufferId, WlSurfaceId, wl_surface::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_syncobj_manager.rs b/src/it/test_ifs/test_syncobj_manager.rs index 315ab421..a91df0a2 100644 --- a/src/it/test_ifs/test_syncobj_manager.rs +++ b/src/it/test_ifs/test_syncobj_manager.rs @@ -10,7 +10,7 @@ use { test_transport::TestTransport, }, video::drm::sync_obj::SyncObj, - wire::{wp_linux_drm_syncobj_manager_v1::*, WpLinuxDrmSyncobjManagerV1Id}, + wire::{WpLinuxDrmSyncobjManagerV1Id, wp_linux_drm_syncobj_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_syncobj_surface.rs b/src/it/test_ifs/test_syncobj_surface.rs index 8dfd913c..b0b27a15 100644 --- a/src/it/test_ifs/test_syncobj_surface.rs +++ b/src/it/test_ifs/test_syncobj_surface.rs @@ -4,7 +4,7 @@ use { test_error::TestResult, test_ifs::test_syncobj_timeline::TestSyncobjTimeline, test_object::TestObject, test_transport::TestTransport, }, - wire::{wp_linux_drm_syncobj_surface_v1::*, WpLinuxDrmSyncobjSurfaceV1Id}, + wire::{WpLinuxDrmSyncobjSurfaceV1Id, wp_linux_drm_syncobj_surface_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_syncobj_timeline.rs b/src/it/test_ifs/test_syncobj_timeline.rs index 929bee26..62c232ee 100644 --- a/src/it/test_ifs/test_syncobj_timeline.rs +++ b/src/it/test_ifs/test_syncobj_timeline.rs @@ -1,7 +1,7 @@ use { crate::{ it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{wp_linux_drm_syncobj_timeline_v1::*, WpLinuxDrmSyncobjTimelineV1Id}, + wire::{WpLinuxDrmSyncobjTimelineV1Id, wp_linux_drm_syncobj_timeline_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_text_input.rs b/src/it/test_ifs/test_text_input.rs index 80d9ad4a..73a069df 100644 --- a/src/it/test_ifs/test_text_input.rs +++ b/src/it/test_ifs/test_text_input.rs @@ -8,7 +8,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{zwp_text_input_v3::*, ZwpTextInputV3Id}, + wire::{ZwpTextInputV3Id, zwp_text_input_v3::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_text_input_manager.rs b/src/it/test_ifs/test_text_input_manager.rs index 40ba33f2..329f5b3a 100644 --- a/src/it/test_ifs/test_text_input_manager.rs +++ b/src/it/test_ifs/test_text_input_manager.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{zwp_text_input_manager_v3::*, ZwpTextInputManagerV3Id}, + wire::{ZwpTextInputManagerV3Id, zwp_text_input_manager_v3::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_toplevel_drag.rs b/src/it/test_ifs/test_toplevel_drag.rs index a337830f..e29efec0 100644 --- a/src/it/test_ifs/test_toplevel_drag.rs +++ b/src/it/test_ifs/test_toplevel_drag.rs @@ -4,7 +4,7 @@ use { test_error::TestError, test_ifs::test_xdg_toplevel::TestXdgToplevel, test_object::TestObject, test_transport::TestTransport, }, - wire::{xdg_toplevel_drag_v1::*, XdgToplevelDragV1Id}, + wire::{XdgToplevelDragV1Id, xdg_toplevel_drag_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_toplevel_drag_manager.rs b/src/it/test_ifs/test_toplevel_drag_manager.rs index 7236ea63..8c4c15eb 100644 --- a/src/it/test_ifs/test_toplevel_drag_manager.rs +++ b/src/it/test_ifs/test_toplevel_drag_manager.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{xdg_toplevel_drag_manager_v1::*, XdgToplevelDragManagerV1Id}, + wire::{XdgToplevelDragManagerV1Id, xdg_toplevel_drag_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_viewport.rs b/src/it/test_ifs/test_viewport.rs index a22df787..b25105c8 100644 --- a/src/it/test_ifs/test_viewport.rs +++ b/src/it/test_ifs/test_viewport.rs @@ -2,7 +2,7 @@ use { crate::{ fixed::Fixed, it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{wp_viewport::*, WpViewportId}, + wire::{WpViewportId, wp_viewport::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_viewporter.rs b/src/it/test_ifs/test_viewporter.rs index 61420efa..5b3a82fd 100644 --- a/src/it/test_ifs/test_viewporter.rs +++ b/src/it/test_ifs/test_viewporter.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{wp_viewporter::*, WpViewporterId}, + wire::{WpViewporterId, wp_viewporter::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_virtual_keyboard.rs b/src/it/test_ifs/test_virtual_keyboard.rs index 38498bc0..830f0be3 100644 --- a/src/it/test_ifs/test_virtual_keyboard.rs +++ b/src/it/test_ifs/test_virtual_keyboard.rs @@ -3,7 +3,7 @@ use { backend::KeyState, ifs::wl_seat::wl_keyboard, it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport}, - wire::{zwp_virtual_keyboard_v1::*, ZwpVirtualKeyboardV1Id}, + wire::{ZwpVirtualKeyboardV1Id, zwp_virtual_keyboard_v1::*}, }, std::{cell::Cell, io::Write, rc::Rc}, uapi::c, diff --git a/src/it/test_ifs/test_virtual_keyboard_manager.rs b/src/it/test_ifs/test_virtual_keyboard_manager.rs index d117a10e..d0231908 100644 --- a/src/it/test_ifs/test_virtual_keyboard_manager.rs +++ b/src/it/test_ifs/test_virtual_keyboard_manager.rs @@ -6,7 +6,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{zwp_virtual_keyboard_manager_v1::*, ZwpVirtualKeyboardManagerV1Id}, + wire::{ZwpVirtualKeyboardManagerV1Id, zwp_virtual_keyboard_manager_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_wl_fixes.rs b/src/it/test_ifs/test_wl_fixes.rs index d14f57a8..00fe5224 100644 --- a/src/it/test_ifs/test_wl_fixes.rs +++ b/src/it/test_ifs/test_wl_fixes.rs @@ -4,7 +4,7 @@ use { test_error::TestResult, test_ifs::test_registry::TestRegistry, test_object::TestObject, test_transport::TestTransport, }, - wire::{wl_fixes::*, WlFixesId}, + wire::{WlFixesId, wl_fixes::*}, }, std::rc::Rc, }; diff --git a/src/it/test_ifs/test_xdg_activation.rs b/src/it/test_ifs/test_xdg_activation.rs index dd55e4f8..3d2ec8c6 100644 --- a/src/it/test_ifs/test_xdg_activation.rs +++ b/src/it/test_ifs/test_xdg_activation.rs @@ -8,7 +8,7 @@ use { test_object::TestObject, test_transport::TestTransport, }, - wire::{xdg_activation_v1::*, XdgActivationV1Id}, + wire::{XdgActivationV1Id, xdg_activation_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_xdg_activation_token.rs b/src/it/test_ifs/test_xdg_activation_token.rs index fba8312b..a828fea8 100644 --- a/src/it/test_ifs/test_xdg_activation_token.rs +++ b/src/it/test_ifs/test_xdg_activation_token.rs @@ -5,7 +5,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{xdg_activation_token_v1::*, XdgActivationTokenV1Id}, + wire::{XdgActivationTokenV1Id, xdg_activation_token_v1::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_xdg_base.rs b/src/it/test_ifs/test_xdg_base.rs index 5701e05b..781697a9 100644 --- a/src/it/test_ifs/test_xdg_base.rs +++ b/src/it/test_ifs/test_xdg_base.rs @@ -5,7 +5,7 @@ use { test_object::TestObject, test_transport::TestTransport, testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{xdg_wm_base::*, WlSurfaceId, XdgWmBaseId}, + wire::{WlSurfaceId, XdgWmBaseId, xdg_wm_base::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_xdg_surface.rs b/src/it/test_ifs/test_xdg_surface.rs index 3546648b..a9d3269b 100644 --- a/src/it/test_ifs/test_xdg_surface.rs +++ b/src/it/test_ifs/test_xdg_surface.rs @@ -9,7 +9,7 @@ use { testrun::ParseFull, }, utils::buffd::MsgParser, - wire::{xdg_surface::*, XdgSurfaceId}, + wire::{XdgSurfaceId, xdg_surface::*}, }, std::{cell::Cell, rc::Rc}, }; diff --git a/src/it/test_ifs/test_xdg_toplevel.rs b/src/it/test_ifs/test_xdg_toplevel.rs index 5757ad73..0dca5a73 100644 --- a/src/it/test_ifs/test_xdg_toplevel.rs +++ b/src/it/test_ifs/test_xdg_toplevel.rs @@ -9,7 +9,7 @@ use { }, tree::{ContainerNode, ContainingNode, FloatNode, ToplevelNodeBase}, utils::buffd::MsgParser, - wire::{xdg_toplevel::*, XdgToplevelId}, + wire::{XdgToplevelId, xdg_toplevel::*}, }, ahash::AHashSet, std::{ diff --git a/src/it/test_mem.rs b/src/it/test_mem.rs index 236808b3..edd6bedb 100644 --- a/src/it/test_mem.rs +++ b/src/it/test_mem.rs @@ -4,7 +4,7 @@ use { utils::{oserror::OsError, ptr_ext::PtrExt}, }, std::{cell::Cell, ops::Deref, ptr, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub struct TestMem { diff --git a/src/it/tests/t0011_set_keymap.rs b/src/it/tests/t0011_set_keymap.rs index a79fc7d3..a362611f 100644 --- a/src/it/tests/t0011_set_keymap.rs +++ b/src/it/tests/t0011_set_keymap.rs @@ -37,10 +37,11 @@ xkb_keymap { ds.kb.press(1); run.sync().await; - tassert!(run - .cfg - .invoked_shortcuts - .contains(&(ds.seat.id(), SYM_F13.into()))); + tassert!( + run.cfg + .invoked_shortcuts + .contains(&(ds.seat.id(), SYM_F13.into())) + ); Ok(()) } diff --git a/src/it/tests/t0031_syncobj.rs b/src/it/tests/t0031_syncobj.rs index 451d049b..bd3376f4 100644 --- a/src/it/tests/t0031_syncobj.rs +++ b/src/it/tests/t0031_syncobj.rs @@ -3,7 +3,7 @@ use { it::{test_error::TestResult, testrun::TestRun}, theme::Color, utils::errorfmt::ErrorFmt, - video::drm::{sync_obj::SyncObjPoint, wait_for_sync_obj::SyncObjWaiter, DrmError}, + video::drm::{DrmError, sync_obj::SyncObjPoint, wait_for_sync_obj::SyncObjWaiter}, }, std::{cell::Cell, rc::Rc}, }; @@ -24,7 +24,9 @@ async fn test(run: Rc) -> TestResult { let eng = run.state.render_ctx.get().unwrap(); let Some(ctx) = eng.sync_obj_ctx() else { - log::warn!("Cannot test explicit sync on this system: render context does not support sync objects"); + log::warn!( + "Cannot test explicit sync on this system: render context does not support sync objects" + ); return Ok(()); }; let syncobj = match ctx.create_sync_obj() { diff --git a/src/it/tests/t0042_toplevel_select.rs b/src/it/tests/t0042_toplevel_select.rs index 332e60e4..b0b41baa 100644 --- a/src/it/tests/t0042_toplevel_select.rs +++ b/src/it/tests/t0042_toplevel_select.rs @@ -1,6 +1,6 @@ use { crate::{ - ifs::wl_seat::{ToplevelSelector, BTN_LEFT}, + ifs::wl_seat::{BTN_LEFT, ToplevelSelector}, it::{test_error::TestResult, testrun::TestRun}, tree::{Node, ToplevelNode}, utils::clonecell::CloneCell, diff --git a/src/kbvm.rs b/src/kbvm.rs index 44236626..d2c4a685 100644 --- a/src/kbvm.rs +++ b/src/kbvm.rs @@ -6,14 +6,13 @@ use { utils::{oserror::OsError, syncqueue::SyncQueue, vecset::VecSet}, }, kbvm::{ + Keycode, lookup::LookupTable, state_machine::{self, Direction, Event, StateMachine}, xkb::{ - self, + self, Keymap, diagnostic::{Diagnostic, WriteToLog}, - Keymap, }, - Keycode, }, std::{ cell::{Cell, Ref, RefCell}, diff --git a/src/keyboard.rs b/src/keyboard.rs index cbe74093..b4f6090b 100644 --- a/src/keyboard.rs +++ b/src/keyboard.rs @@ -6,7 +6,7 @@ use { rc::Rc, }, thiserror::Error, - uapi::{c, Errno, OwnedFd}, + uapi::{Errno, OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/libinput.rs b/src/libinput.rs index 64a26967..30e0d5e6 100644 --- a/src/libinput.rs +++ b/src/libinput.rs @@ -9,8 +9,8 @@ use { crate::{ libinput::{ consts::{ - LogPriority, LIBINPUT_LOG_PRIORITY_DEBUG, LIBINPUT_LOG_PRIORITY_ERROR, - LIBINPUT_LOG_PRIORITY_INFO, + LIBINPUT_LOG_PRIORITY_DEBUG, LIBINPUT_LOG_PRIORITY_ERROR, + LIBINPUT_LOG_PRIORITY_INFO, LogPriority, }, device::RegisteredDevice, event::LibInputEvent, @@ -28,7 +28,7 @@ use { isnt::std_1::primitive::IsntConstPtrExt, std::{ffi::CStr, rc::Rc}, thiserror::Error, - uapi::{c, Errno, IntoUstr, OwnedFd}, + uapi::{Errno, IntoUstr, OwnedFd, c}, }; static INTERFACE: libinput_interface = libinput_interface { diff --git a/src/libinput/device.rs b/src/libinput/device.rs index b32889f8..473c2b37 100644 --- a/src/libinput/device.rs +++ b/src/libinput/device.rs @@ -1,5 +1,6 @@ use { crate::libinput::{ + LibInput, consts::{ AccelProfile, ConfigDragLockState, ConfigDragState, ConfigTapState, DeviceCapability, LIBINPUT_CONFIG_DRAG_DISABLED, LIBINPUT_CONFIG_DRAG_ENABLED, @@ -37,7 +38,6 @@ use { libinput_tablet_pad_mode_group_has_button, libinput_tablet_pad_mode_group_has_ring, libinput_tablet_pad_mode_group_has_strip, }, - LibInput, }, bstr::ByteSlice, std::{ffi::CStr, marker::PhantomData, rc::Rc}, @@ -80,11 +80,7 @@ impl<'a> LibInputDevice<'a> { pub fn slot(&self) -> Option { let res = unsafe { libinput_device_get_user_data(self.dev) as usize }; - if res == 0 { - None - } else { - Some(res - 1) - } + if res == 0 { None } else { Some(res - 1) } } pub fn has_cap(&self, cap: DeviceCapability) -> bool { diff --git a/src/libinput/sys.rs b/src/libinput/sys.rs index a30c6ea0..f1d660d9 100644 --- a/src/libinput/sys.rs +++ b/src/libinput/sys.rs @@ -330,7 +330,7 @@ unsafe extern "C" { index: c::c_uint, ) -> *mut libinput_tablet_pad_mode_group; pub fn libinput_device_tablet_pad_get_num_mode_groups(device: *mut libinput_device) - -> c::c_int; + -> c::c_int; pub fn libinput_device_tablet_pad_get_num_buttons(device: *mut libinput_device) -> c::c_int; pub fn libinput_device_tablet_pad_get_num_rings(device: *mut libinput_device) -> c::c_int; pub fn libinput_device_tablet_pad_get_num_strips(device: *mut libinput_device) -> c::c_int; diff --git a/src/logger.rs b/src/logger.rs index 4ada28a9..0a37c702 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -11,12 +11,12 @@ use { os::unix::{ffi::OsStringExt, fs::DirBuilderExt}, ptr, sync::{ - atomic::{AtomicI32, AtomicU32, Ordering::Relaxed}, Arc, + atomic::{AtomicI32, AtomicU32, Ordering::Relaxed}, }, time::SystemTime, }, - uapi::{c, format_ustr, Errno, Fd, OwnedFd, Ustring}, + uapi::{Errno, Fd, OwnedFd, Ustring, c, format_ustr}, }; thread_local! { diff --git a/src/logind.rs b/src/logind.rs index 5e73f11c..224b59c6 100644 --- a/src/logind.rs +++ b/src/logind.rs @@ -1,6 +1,6 @@ use { crate::{ - dbus::{DbusError, DbusSocket, SignalHandler, FALSE}, + dbus::{DbusError, DbusSocket, FALSE, SignalHandler}, utils::errorfmt::ErrorFmt, wire_dbus::{ org, @@ -62,7 +62,7 @@ impl Session { .get_async::(LOGIND_NAME, &session_path) .await; match seat { - Ok(s) => s.get().1 .0.to_string(), + Ok(s) => s.get().1.0.to_string(), Err(e) => return Err(LogindError::GetSeatName(e)), } }; diff --git a/src/output_schedule.rs b/src/output_schedule.rs index 548701f9..8164922e 100644 --- a/src/output_schedule.rs +++ b/src/output_schedule.rs @@ -10,7 +10,7 @@ use { numcell::NumCell, }, }, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, num_traits::ToPrimitive, std::{cell::Cell, rc::Rc}, }; diff --git a/src/pango.rs b/src/pango.rs index 26c195ef..889ed260 100644 --- a/src/pango.rs +++ b/src/pango.rs @@ -7,7 +7,7 @@ use { }, std::{cell::Cell, ptr, rc::Rc}, thiserror::Error, - uapi::{c, IntoUstr}, + uapi::{IntoUstr, c}, }; pub mod consts; diff --git a/src/pipewire/pw_con.rs b/src/pipewire/pw_con.rs index 8f1228fb..8d53e2e0 100644 --- a/src/pipewire/pw_con.rs +++ b/src/pipewire/pw_con.rs @@ -3,15 +3,15 @@ use { async_engine::{AsyncEngine, SpawnedFuture}, io_uring::{IoUring, IoUringError}, pipewire::{ - pw_formatter::{format, PwFormatter}, + pw_formatter::{PwFormatter, format}, pw_ifs::{ pw_client::{PwClient, PwClientMethods}, pw_client_node::{ - PwClientNode, PW_CLIENT_NODE_FACTORY, PW_CLIENT_NODE_INTERFACE, - PW_CLIENT_NODE_VERSION, + PW_CLIENT_NODE_FACTORY, PW_CLIENT_NODE_INTERFACE, PW_CLIENT_NODE_VERSION, + PwClientNode, }, - pw_core::{PwCore, PwCoreMethods, PW_CORE_VERSION}, - pw_registry::{PwRegistry, PW_REGISTRY_VERSION}, + pw_core::{PW_CORE_VERSION, PwCore, PwCoreMethods}, + pw_registry::{PW_REGISTRY_VERSION, PwRegistry}, }, pw_mem::PwMemPool, pw_object::{PwObject, PwObjectData, PwObjectError, PwOpcode}, @@ -36,7 +36,7 @@ use { rc::{Rc, Weak}, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/pipewire/pw_ifs/pw_client_node.rs b/src/pipewire/pw_ifs/pw_client_node.rs index ca5dbedb..42770b17 100644 --- a/src/pipewire/pw_ifs/pw_client_node.rs +++ b/src/pipewire/pw_ifs/pw_client_node.rs @@ -3,40 +3,40 @@ use { crate::{ async_engine::SpawnedFuture, - format::{pw_formats, Format}, + format::{Format, pw_formats}, pipewire::{ pw_con::PwCon, pw_mem::{PwMemError, PwMemMap, PwMemSlice, PwMemTyped}, pw_object::{PwObject, PwObjectData}, pw_parser::{PwParser, PwParserError}, pw_pod::{ - pw_node_activation, spa_chunk, spa_io_buffers, spa_meta_bitmap, spa_meta_busy, - spa_meta_cursor, spa_meta_header, spa_meta_region, PW_CHOICE_Enum, PW_CHOICE_Flags, - PW_OBJECT_Format, PW_OBJECT_ParamBuffers, PW_OBJECT_ParamMeta, PW_TYPE_Long, + PW_CHOICE_Enum, PW_CHOICE_Flags, PW_NODE_ACTIVATION_FINISHED, + PW_NODE_ACTIVATION_NOT_TRIGGERED, PW_NODE_ACTIVATION_TRIGGERED, PW_OBJECT_Format, + PW_OBJECT_ParamBuffers, PW_OBJECT_ParamMeta, PW_PROP_DONT_FIXATE, PW_TYPE_Long, PwIoType, PwPod, PwPodFraction, PwPodObject, PwPodRectangle, PwPropFlag, - SPA_DATA_DmaBuf, SPA_DATA_MemFd, SPA_DATA_MemPtr, SPA_FORMAT_VIDEO_format, + SPA_DATA_DmaBuf, SPA_DATA_FLAG_READABLE, SPA_DATA_MemFd, SPA_DATA_MemPtr, + SPA_DIRECTION_INPUT, SPA_DIRECTION_OUTPUT, SPA_FORMAT_VIDEO_format, SPA_FORMAT_VIDEO_framerate, SPA_FORMAT_VIDEO_modifier, SPA_FORMAT_VIDEO_size, SPA_FORMAT_mediaSubtype, SPA_FORMAT_mediaType, SPA_IO_Buffers, SPA_META_Bitmap, SPA_META_Busy, SPA_META_Control, SPA_META_Cursor, SPA_META_Header, - SPA_META_VideoCrop, SPA_META_VideoDamage, SPA_NODE_COMMAND_Pause, - SPA_NODE_COMMAND_Start, SPA_NODE_COMMAND_Suspend, SPA_PARAM_BUFFERS_blocks, - SPA_PARAM_BUFFERS_buffers, SPA_PARAM_BUFFERS_dataType, SPA_PARAM_Buffers, - SPA_PARAM_EnumFormat, SPA_PARAM_Format, SPA_PARAM_META_size, SPA_PARAM_META_type, - SPA_PARAM_Meta, SpaDataFlags, SpaDataType, SpaDirection, SpaIoType, - SpaMediaSubtype, SpaMediaType, SpaMetaType, SpaNodeBuffersFlags, SpaNodeCommand, - SpaParamType, SpaVideoFormat, PW_NODE_ACTIVATION_FINISHED, - PW_NODE_ACTIVATION_NOT_TRIGGERED, PW_NODE_ACTIVATION_TRIGGERED, - PW_PROP_DONT_FIXATE, SPA_DATA_FLAG_READABLE, SPA_DIRECTION_INPUT, - SPA_DIRECTION_OUTPUT, SPA_NODE_BUFFERS_FLAG_ALLOC, SPA_PARAM_INFO, - SPA_PARAM_INFO_READ, SPA_PARAM_INFO_SERIAL, SPA_PORT_FLAG, - SPA_PORT_FLAG_CAN_ALLOC_BUFFERS, + SPA_META_VideoCrop, SPA_META_VideoDamage, SPA_NODE_BUFFERS_FLAG_ALLOC, + SPA_NODE_COMMAND_Pause, SPA_NODE_COMMAND_Start, SPA_NODE_COMMAND_Suspend, + SPA_PARAM_BUFFERS_blocks, SPA_PARAM_BUFFERS_buffers, SPA_PARAM_BUFFERS_dataType, + SPA_PARAM_Buffers, SPA_PARAM_EnumFormat, SPA_PARAM_Format, SPA_PARAM_INFO, + SPA_PARAM_INFO_READ, SPA_PARAM_INFO_SERIAL, SPA_PARAM_META_size, + SPA_PARAM_META_type, SPA_PARAM_Meta, SPA_PORT_FLAG, + SPA_PORT_FLAG_CAN_ALLOC_BUFFERS, SpaDataFlags, SpaDataType, SpaDirection, + SpaIoType, SpaMediaSubtype, SpaMediaType, SpaMetaType, SpaNodeBuffersFlags, + SpaNodeCommand, SpaParamType, SpaVideoFormat, pw_node_activation, spa_chunk, + spa_io_buffers, spa_meta_bitmap, spa_meta_busy, spa_meta_cursor, spa_meta_header, + spa_meta_region, }, }, utils::{ bitfield::Bitfield, buf::TypedBuf, clonecell::CloneCell, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, option_ext::OptionExt, }, - video::{dmabuf::DmaBuf, Modifier}, + video::{Modifier, dmabuf::DmaBuf}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/pipewire/pw_ifs/pw_core.rs b/src/pipewire/pw_ifs/pw_core.rs index 5d5e4597..2448e8ab 100644 --- a/src/pipewire/pw_ifs/pw_core.rs +++ b/src/pipewire/pw_ifs/pw_core.rs @@ -59,7 +59,9 @@ impl PwCore { let name = p2.read_string()?; let change_mask = p2.read_long()?; let dict = p2.read_dict_struct()?; - log::info!("info: id={id}, cookie={cookie}, user_name={user_name}, host_name={host_name}, version_name={version_name}, name={name}, change_mask={change_mask}"); + log::info!( + "info: id={id}, cookie={cookie}, user_name={user_name}, host_name={host_name}, version_name={version_name}, name={name}, change_mask={change_mask}" + ); log::info!("dict: {:#?}", dict); Ok(()) } diff --git a/src/pipewire/pw_mem.rs b/src/pipewire/pw_mem.rs index 237b234c..3d96b0c1 100644 --- a/src/pipewire/pw_mem.rs +++ b/src/pipewire/pw_mem.rs @@ -1,14 +1,14 @@ use { crate::utils::{ copyhashmap::CopyHashMap, - mmap::{mmap, Mmapped}, + mmap::{Mmapped, mmap}, oserror::OsError, page_size::page_size, ptr_ext::{MutPtrExt, PtrExt}, }, std::{marker::PhantomData, ops::Range, rc::Rc}, thiserror::Error, - uapi::{c, OwnedFd, Pod}, + uapi::{OwnedFd, Pod, c}, }; #[derive(Default)] diff --git a/src/pipewire/pw_pod.rs b/src/pipewire/pw_pod.rs index bd720436..c8285684 100644 --- a/src/pipewire/pw_pod.rs +++ b/src/pipewire/pw_pod.rs @@ -9,7 +9,7 @@ use { fmt::{Debug, Formatter}, sync::atomic::{AtomicI32, AtomicU32}, }, - uapi::{c, Pod}, + uapi::{Pod, c}, }; macro_rules! ty { diff --git a/src/portal.rs b/src/portal.rs index 76d1a03a..9dc71936 100644 --- a/src/portal.rs +++ b/src/portal.rs @@ -11,22 +11,22 @@ use { async_engine::AsyncEngine, cli::GlobalArgs, dbus::{ - Dbus, DbusSocket, BUS_DEST, BUS_PATH, DBUS_NAME_FLAG_DO_NOT_QUEUE, - DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER, + BUS_DEST, BUS_PATH, DBUS_NAME_FLAG_DO_NOT_QUEUE, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER, + Dbus, DbusSocket, }, forker::ForkerError, io_uring::IoUring, logger::Logger, pipewire::pw_con::{PwCon, PwConHolder, PwConOwner}, portal::{ - ptl_display::{watch_displays, PortalDisplay, PortalDisplayId}, + ptl_display::{PortalDisplay, PortalDisplayId, watch_displays}, ptl_remote_desktop::add_remote_desktop_dbus_members, ptl_render_ctx::PortalRenderCtx, ptl_screencast::add_screencast_dbus_members, ptl_session::PortalSession, }, utils::{ - clone3::{fork_with_pidfd, Forked}, + clone3::{Forked, fork_with_pidfd}, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, line_logger::log_lines, @@ -49,7 +49,7 @@ use { sync::Arc, }, thiserror::Error, - uapi::{c, getpid, OwnedFd}, + uapi::{OwnedFd, c, getpid}, }; const PORTAL_SUCCESS: u32 = 0; diff --git a/src/portal/ptl_display.rs b/src/portal/ptl_display.rs index 5ea445a9..bd0d2dd1 100644 --- a/src/portal/ptl_display.rs +++ b/src/portal/ptl_display.rs @@ -1,14 +1,14 @@ use { crate::{ - gfx_api::{cross_intersect_formats, GfxFormat}, + gfx_api::{GfxFormat, cross_intersect_formats}, gfx_apis::create_gfx_context, ifs::wl_seat::POINTER, object::Version, portal::{ + PortalState, ptl_render_ctx::{PortalRenderCtx, PortalServerRenderCtx}, ptl_session::PortalSession, ptr_gui::WindowData, - PortalState, }, utils::{ bitflags::BitflagsExt, @@ -16,15 +16,16 @@ use { copyhashmap::CopyHashMap, errorfmt::ErrorFmt, hash_map_ext::HashMapExt, - opaque::{opaque, Opaque}, + opaque::{Opaque, opaque}, oserror::OsError, }, video::drm::Drm, wire::{ - wl_pointer, JayCompositor, WlCompositor, WlOutput, WlSeat, WlSurfaceId, - WpFractionalScaleManagerV1, WpViewporter, ZwlrLayerShellV1, ZwpLinuxDmabufV1, + JayCompositor, WlCompositor, WlOutput, WlSeat, WlSurfaceId, WpFractionalScaleManagerV1, + WpViewporter, ZwlrLayerShellV1, ZwpLinuxDmabufV1, wl_pointer, }, wl_usr::{ + UsrCon, UsrConOwner, usr_ifs::{ usr_jay_compositor::UsrJayCompositor, usr_jay_output::{UsrJayOutput, UsrJayOutputOwner}, @@ -42,7 +43,6 @@ use { usr_wp_fractional_scale_manager::UsrWpFractionalScaleManager, usr_wp_viewporter::UsrWpViewporter, }, - UsrCon, UsrConOwner, }, }, ahash::AHashMap, @@ -54,7 +54,7 @@ use { rc::Rc, str::FromStr, }, - uapi::{c, AsUstr, OwnedFd}, + uapi::{AsUstr, OwnedFd, c}, }; struct PortalDisplayPrelude { diff --git a/src/portal/ptl_remote_desktop.rs b/src/portal/ptl_remote_desktop.rs index 2c0f8634..0cb465d9 100644 --- a/src/portal/ptl_remote_desktop.rs +++ b/src/portal/ptl_remote_desktop.rs @@ -2,14 +2,14 @@ mod remote_desktop_gui; use { crate::{ - dbus::{prelude::Variant, DbusObject, PendingReply}, + dbus::{DbusObject, PendingReply, prelude::Variant}, ifs::jay_compositor::CREATE_EI_SESSION_SINCE, portal::{ + PORTAL_SUCCESS, PortalState, ptl_display::{PortalDisplay, PortalDisplayId}, ptl_remote_desktop::remote_desktop_gui::SelectionGui, ptl_screencast::ScreencastPhase, ptl_session::{PortalSession, PortalSessionReply}, - PortalState, PORTAL_SUCCESS, }, utils::{ clonecell::{CloneCell, UnsafeCellCloneSafe}, diff --git a/src/portal/ptl_remote_desktop/remote_desktop_gui.rs b/src/portal/ptl_remote_desktop/remote_desktop_gui.rs index 5e11e392..c616cb6b 100644 --- a/src/portal/ptl_remote_desktop/remote_desktop_gui.rs +++ b/src/portal/ptl_remote_desktop/remote_desktop_gui.rs @@ -1,6 +1,6 @@ use { crate::{ - ifs::wl_seat::{wl_pointer::PRESSED, BTN_LEFT}, + ifs::wl_seat::{BTN_LEFT, wl_pointer::PRESSED}, portal::{ ptl_display::{PortalDisplay, PortalOutput, PortalSeat}, ptl_remote_desktop::{PortalSession, RemoteDesktopPhase}, diff --git a/src/portal/ptl_screencast.rs b/src/portal/ptl_screencast.rs index acab639c..ec8b09cc 100644 --- a/src/portal/ptl_screencast.rs +++ b/src/portal/ptl_screencast.rs @@ -2,8 +2,8 @@ mod screencast_gui; use { crate::{ - allocator::{AllocatorError, BufferObject, BufferUsage, BO_USE_RENDERING}, - dbus::{prelude::Variant, DbusObject, DictEntry, PendingReply}, + allocator::{AllocatorError, BO_USE_RENDERING, BufferObject, BufferUsage}, + dbus::{DbusObject, DictEntry, PendingReply, prelude::Variant}, format::{Format, XRGB8888}, ifs::{jay_compositor::GET_TOPLEVEL_SINCE, jay_screencast::CLIENT_BUFFERS_SINCE}, pipewire::{ @@ -14,17 +14,17 @@ use { SUPPORTED_META_VIDEO_CROP, }, pw_pod::{ - spa_point, spa_rectangle, spa_region, PwPodRectangle, SPA_DATA_DmaBuf, - SPA_MEDIA_SUBTYPE_raw, SPA_MEDIA_TYPE_video, SpaChunkFlags, SPA_STATUS_HAVE_DATA, - SPA_VIDEO_FORMAT_UNKNOWN, + PwPodRectangle, SPA_DATA_DmaBuf, SPA_MEDIA_SUBTYPE_raw, SPA_MEDIA_TYPE_video, + SPA_STATUS_HAVE_DATA, SPA_VIDEO_FORMAT_UNKNOWN, SpaChunkFlags, spa_point, + spa_rectangle, spa_region, }, }, portal::{ + PORTAL_SUCCESS, PortalState, ptl_display::{PortalDisplay, PortalDisplayId, PortalOutput}, ptl_remote_desktop::RemoteDesktopPhase, ptl_screencast::screencast_gui::SelectionGui, ptl_session::{PortalSession, PortalSessionReply}, - PortalState, PORTAL_SUCCESS, }, utils::{ clonecell::{CloneCell, UnsafeCellCloneSafe}, @@ -32,7 +32,7 @@ use { errorfmt::ErrorFmt, opaque::Opaque, }, - video::{dmabuf::DmaBuf, Modifier, LINEAR_MODIFIER}, + video::{LINEAR_MODIFIER, Modifier, dmabuf::DmaBuf}, wire::jay_screencast::Ready, wire_dbus::{ org, diff --git a/src/portal/ptl_screencast/screencast_gui.rs b/src/portal/ptl_screencast/screencast_gui.rs index 9783ebfb..a4276be1 100644 --- a/src/portal/ptl_screencast/screencast_gui.rs +++ b/src/portal/ptl_screencast/screencast_gui.rs @@ -1,6 +1,6 @@ use { crate::{ - ifs::wl_seat::{wl_pointer::PRESSED, BTN_LEFT}, + ifs::wl_seat::{BTN_LEFT, wl_pointer::PRESSED}, portal::{ ptl_display::{PortalDisplay, PortalOutput, PortalSeat}, ptl_screencast::{ diff --git a/src/portal/ptl_session.rs b/src/portal/ptl_session.rs index 5a94df5a..c248c910 100644 --- a/src/portal/ptl_session.rs +++ b/src/portal/ptl_session.rs @@ -1,11 +1,11 @@ use { crate::{ - dbus::{prelude::Variant, DbusObject, DictEntry, DynamicType, PendingReply, FALSE}, + dbus::{DbusObject, DictEntry, DynamicType, FALSE, PendingReply, prelude::Variant}, pipewire::pw_con::PwCon, portal::{ + PORTAL_SUCCESS, PortalState, ptl_remote_desktop::{DeviceTypes, RemoteDesktopPhase}, ptl_screencast::{ScreencastPhase, ScreencastTarget}, - PortalState, PORTAL_SUCCESS, }, utils::{clonecell::CloneCell, hash_map_ext::HashMapExt}, wire_dbus::org::freedesktop::impl_::portal::{ diff --git a/src/portal/ptl_text.rs b/src/portal/ptl_text.rs index 81112393..3804c101 100644 --- a/src/portal/ptl_text.rs +++ b/src/portal/ptl_text.rs @@ -3,8 +3,8 @@ use { format::ARGB8888, gfx_api::{GfxContext, GfxTexture}, pango::{ - consts::{CAIRO_FORMAT_ARGB32, CAIRO_OPERATOR_SOURCE}, CairoContext, CairoImageSurface, PangoCairoContext, PangoFontDescription, PangoLayout, + consts::{CAIRO_FORMAT_ARGB32, CAIRO_OPERATOR_SOURCE}, }, rect::Rect, theme::Color, diff --git a/src/portal/ptr_gui.rs b/src/portal/ptr_gui.rs index 246f455b..265ef2c9 100644 --- a/src/portal/ptr_gui.rs +++ b/src/portal/ptr_gui.rs @@ -1,12 +1,12 @@ use { crate::{ - allocator::{BufferObject, BufferUsage, BO_USE_RENDERING}, + allocator::{BO_USE_RENDERING, BufferObject, BufferUsage}, async_engine::{Phase, SpawnedFuture}, cursor::KnownCursor, fixed::Fixed, format::ARGB8888, gfx_api::{ - needs_render_usage, AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync, + AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync, needs_render_usage, }, ifs::zwlr_layer_shell_v1::OVERLAY, portal::{ @@ -21,8 +21,8 @@ use { errorfmt::ErrorFmt, hash_map_ext::HashMapExt, rc_eq::rc_eq, }, wire::{ - wp_fractional_scale_v1::PreferredScale, zwlr_layer_surface_v1::Configure, - ZwpLinuxBufferParamsV1Id, + ZwpLinuxBufferParamsV1Id, wp_fractional_scale_v1::PreferredScale, + zwlr_layer_surface_v1::Configure, }, wl_usr::usr_ifs::{ usr_linux_buffer_params::{UsrLinuxBufferParams, UsrLinuxBufferParamsOwner}, diff --git a/src/rect/region.rs b/src/rect/region.rs index d385c7ad..980dfc7a 100644 --- a/src/rect/region.rs +++ b/src/rect/region.rs @@ -7,8 +7,8 @@ use { }, }, jay_algorithms::rect::{ - region::{extents, rects_to_bands, subtract, union}, RectRaw, + region::{extents, rects_to_bands, subtract, union}, }, smallvec::SmallVec, std::{ diff --git a/src/renderer.rs b/src/renderer.rs index 4a1a6028..a2bdfdbf 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -2,10 +2,10 @@ use { crate::{ gfx_api::{AcquireSync, GfxApiOpt, ReleaseSync, SampleRect}, ifs::wl_surface::{ - x_surface::xwindow::Xwindow, - xdg_surface::{xdg_toplevel::XdgToplevel, XdgSurface}, - zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, SurfaceBuffer, WlSurface, + x_surface::xwindow::Xwindow, + xdg_surface::{XdgSurface, xdg_toplevel::XdgToplevel}, + zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, }, rect::Rect, renderer::renderer_base::RendererBase, diff --git a/src/renderer/renderer_base.rs b/src/renderer/renderer_base.rs index 2c983c92..d234ffea 100644 --- a/src/renderer/renderer_base.rs +++ b/src/renderer/renderer_base.rs @@ -215,10 +215,10 @@ fn bound_target( cold(); let SampleRect { - x1: ref mut t_x1, - x2: ref mut t_x2, - y1: ref mut t_y1, - y2: ref mut t_y2, + x1: t_x1, + x2: t_x2, + y1: t_y1, + y2: t_y2, .. } = texcoord; diff --git a/src/screenshoter.rs b/src/screenshoter.rs index 9b5b0dde..ad613c9f 100644 --- a/src/screenshoter.rs +++ b/src/screenshoter.rs @@ -1,8 +1,8 @@ use { crate::{ - allocator::{AllocatorError, BufferObject, BufferUsage, BO_USE_RENDERING}, + allocator::{AllocatorError, BO_USE_RENDERING, BufferObject, BufferUsage}, format::XRGB8888, - gfx_api::{needs_render_usage, AcquireSync, GfxError, ReleaseSync}, + gfx_api::{AcquireSync, GfxError, ReleaseSync, needs_render_usage}, scale::Scale, state::State, video::drm::DrmError, diff --git a/src/security_context_acceptor.rs b/src/security_context_acceptor.rs index 538b322f..2a3e6141 100644 --- a/src/security_context_acceptor.rs +++ b/src/security_context_acceptor.rs @@ -10,7 +10,7 @@ use { fmt::{Display, Formatter}, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Default)] diff --git a/src/sighand.rs b/src/sighand.rs index bd403163..bf464e06 100644 --- a/src/sighand.rs +++ b/src/sighand.rs @@ -6,7 +6,7 @@ use { }, std::rc::Rc, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/state.rs b/src/state.rs index a2354d86..a69c3795 100644 --- a/src/state.rs +++ b/src/state.rs @@ -9,7 +9,7 @@ use { }, backends::dummy::DummyBackend, cli::RunArgs, - client::{Client, ClientId, Clients, SerialRange, NUM_CACHED_SERIAL_RANGES}, + client::{Client, ClientId, Clients, NUM_CACHED_SERIAL_RANGES, SerialRange}, clientmem::ClientMemOffset, compositor::LIBEI_SOCKET, config::ConfigProxy, @@ -28,7 +28,7 @@ use { format::Format, gfx_api::{ AcquireSync, BufferResv, GfxContext, GfxError, GfxFramebuffer, GfxTexture, - PendingShmTransfer, ReleaseSync, SampleRect, SyncFile, STAGING_DOWNLOAD, + PendingShmTransfer, ReleaseSync, STAGING_DOWNLOAD, SampleRect, SyncFile, }, gfx_apis::create_gfx_context, globals::{Globals, GlobalsError, RemovableWaylandGlobal, WaylandGlobal}, @@ -37,8 +37,8 @@ use { ext_idle_notification_v1::ExtIdleNotificationV1, ext_session_lock_v1::ExtSessionLockV1, ipc::{ - data_control::DataControlDeviceIds, x_data_device::XIpcDeviceIds, DataOfferIds, - DataSourceIds, + DataOfferIds, DataSourceIds, data_control::DataControlDeviceIds, + x_data_device::XIpcDeviceIds, }, jay_render_ctx::JayRenderCtx, jay_screencast::JayScreencast, @@ -47,15 +47,15 @@ use { wl_drm::WlDrmGlobal, wl_output::{OutputGlobalOpt, OutputId, PersistentOutputState}, wl_seat::{ - tablet::{TabletIds, TabletInit, TabletPadIds, TabletPadInit, TabletToolIds}, PhysicalKeyboardId, PhysicalKeyboardIds, SeatIds, WlSeatGlobal, + tablet::{TabletIds, TabletInit, TabletPadIds, TabletPadInit, TabletToolIds}, }, wl_surface::{ + NoneSurfaceExt, tray::TrayItemIds, wl_subsurface::SubsurfaceIds, zwp_idle_inhibitor_v1::{IdleInhibitorId, IdleInhibitorIds, ZwpIdleInhibitorV1}, zwp_input_popup_surface_v2::ZwpInputPopupSurfaceV2, - NoneSurfaceExt, }, workspace_manager::WorkspaceManagerState, wp_drm_lease_connector_v1::WpDrmLeaseConnectorV1, @@ -91,9 +91,9 @@ use { video::{ dmabuf::DmaBufIds, drm::{ + Drm, sync_obj::{SyncObj, SyncObjPoint}, wait_for_sync_obj::WaitForSyncObj, - Drm, }, }, wheel::Wheel, @@ -106,8 +106,8 @@ use { ahash::{AHashMap, AHashSet}, bstr::ByteSlice, jay_config::{ - video::{GfxApi, Transform}, PciId, + video::{GfxApi, Transform}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/tasks/connector.rs b/src/tasks/connector.rs index 7c84c0bc..6f8c70a1 100644 --- a/src/tasks/connector.rs +++ b/src/tasks/connector.rs @@ -8,7 +8,7 @@ use { }, output_schedule::OutputSchedule, state::{ConnectorData, OutputData, State}, - tree::{move_ws_to_output, OutputNode, OutputRenderData, WsMoveConfig}, + tree::{OutputNode, OutputRenderData, WsMoveConfig, move_ws_to_output}, utils::{asyncevent::AsyncEvent, clonecell::CloneCell, hash_map_ext::HashMapExt}, }, std::{ diff --git a/src/tasks/hardware_cursor.rs b/src/tasks/hardware_cursor.rs index 89b748df..6ebdbbb6 100644 --- a/src/tasks/hardware_cursor.rs +++ b/src/tasks/hardware_cursor.rs @@ -1,6 +1,6 @@ use { crate::{state::State, utils::errorfmt::ErrorFmt}, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, std::rc::Rc, }; diff --git a/src/tasks/idle.rs b/src/tasks/idle.rs index 6e786774..6477c80a 100644 --- a/src/tasks/idle.rs +++ b/src/tasks/idle.rs @@ -7,7 +7,7 @@ use { timer::{TimerError, TimerFd}, }, }, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, std::{rc::Rc, time::Duration}, uapi::c, }; diff --git a/src/tasks/input_device.rs b/src/tasks/input_device.rs index 7e1855f8..189e6d43 100644 --- a/src/tasks/input_device.rs +++ b/src/tasks/input_device.rs @@ -3,7 +3,7 @@ use { backend::{InputDevice, InputDeviceCapability}, ifs::wl_seat::PX_PER_SCROLL, state::{DeviceHandlerData, InputDeviceData, State}, - tasks::udev_utils::{udev_props, UdevProps}, + tasks::udev_utils::{UdevProps, udev_props}, utils::asyncevent::AsyncEvent, }, jay_config::_private::DEFAULT_SEAT_NAME, diff --git a/src/text.rs b/src/text.rs index 0a9408d4..6a0c972e 100644 --- a/src/text.rs +++ b/src/text.rs @@ -7,11 +7,11 @@ use { GfxTexture, PendingShmTransfer, STAGING_UPLOAD, }, pango::{ + CairoContext, CairoImageSurface, PangoCairoContext, PangoError, PangoFontDescription, + PangoLayout, consts::{ CAIRO_FORMAT_ARGB32, CAIRO_OPERATOR_SOURCE, PANGO_ELLIPSIZE_END, PANGO_SCALE, }, - CairoContext, CairoImageSurface, PangoCairoContext, PangoError, PangoFontDescription, - PangoLayout, }, rect::{Rect, Region}, theme::Color, diff --git a/src/tools/tool_client.rs b/src/tools/tool_client.rs index 73da591f..12f801fc 100644 --- a/src/tools/tool_client.rs +++ b/src/tools/tool_client.rs @@ -23,8 +23,8 @@ use { }, wheel::{Wheel, WheelError}, wire::{ - wl_callback, wl_display, wl_registry, JayCompositor, JayCompositorId, - JayDamageTracking, JayDamageTrackingId, WlCallbackId, WlRegistryId, + JayCompositor, JayCompositorId, JayDamageTracking, JayDamageTrackingId, WlCallbackId, + WlRegistryId, wl_callback, wl_display, wl_registry, }, }, ahash::AHashMap, diff --git a/src/tracy.rs b/src/tracy.rs index fa1e46c4..be2a4ca6 100644 --- a/src/tracy.rs +++ b/src/tracy.rs @@ -12,4 +12,4 @@ mod tracy_noop; #[cfg(not(feature = "tracy"))] use tracy_noop as imp; -pub use imp::{enable_profiler, FrameName, ZoneName}; +pub use imp::{FrameName, ZoneName, enable_profiler}; diff --git a/src/tracy/tracy_impl.rs b/src/tracy/tracy_impl.rs index 04b92a16..5b5d0b51 100644 --- a/src/tracy/tracy_impl.rs +++ b/src/tracy/tracy_impl.rs @@ -5,8 +5,8 @@ use { ffi::{CStr, CString}, ptr, sync::{ - atomic::{AtomicBool, Ordering::Relaxed}, LazyLock, + atomic::{AtomicBool, Ordering::Relaxed}, }, }, tracy_client_sys::{ diff --git a/src/tree.rs b/src/tree.rs index 53352391..21c7ba20 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -5,15 +5,15 @@ use { fixed::Fixed, ifs::{ wl_seat::{ + Dnd, NodeSeatState, WlSeatGlobal, tablet::{ PadButtonState, TabletPad, TabletPadGroup, TabletPadRing, TabletPadStrip, TabletRingEventSource, TabletStripEventSource, TabletTool, TabletToolChanges, ToolButtonState, }, wl_pointer::PendingScroll, - Dnd, NodeSeatState, WlSeatGlobal, }, - wl_surface::{tray::TrayItemId, WlSurface}, + wl_surface::{WlSurface, tray::TrayItemId}, }, keyboard::KeyboardState, rect::Rect, diff --git a/src/tree/container.rs b/src/tree/container.rs index a60a9651..f6fb23ab 100644 --- a/src/tree/container.rs +++ b/src/tree/container.rs @@ -6,10 +6,10 @@ use { fixed::Fixed, gfx_api::GfxTexture, ifs::wl_seat::{ - collect_kb_foci, collect_kb_foci2, + BTN_LEFT, BTN_RIGHT, NodeSeatState, SeatId, WlSeatGlobal, collect_kb_foci, + collect_kb_foci2, tablet::{TabletTool, TabletToolChanges, TabletToolId}, wl_pointer::PendingScroll, - NodeSeatState, SeatId, WlSeatGlobal, BTN_LEFT, BTN_RIGHT, }, rect::Rect, renderer::Renderer, @@ -17,9 +17,9 @@ use { state::State, text::TextTexture, tree::{ - default_tile_drag_bounds, walker::NodeVisitor, ContainingNode, Direction, - FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, TddType, TileDragDestination, - ToplevelData, ToplevelNode, ToplevelNodeBase, WorkspaceNode, + ContainingNode, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + TddType, TileDragDestination, ToplevelData, ToplevelNode, ToplevelNodeBase, + WorkspaceNode, default_tile_drag_bounds, walker::NodeVisitor, }, utils::{ asyncevent::AsyncEvent, diff --git a/src/tree/display.rs b/src/tree/display.rs index b47aba55..65bdcbf2 100644 --- a/src/tree/display.rs +++ b/src/tree/display.rs @@ -3,14 +3,13 @@ use { backend::ConnectorId, cursor::KnownCursor, fixed::Fixed, - ifs::wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal}, + ifs::wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool}, rect::Rect, renderer::Renderer, state::State, tree::{ - walker::NodeVisitor, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, - OutputNode, StackedNode, TileDragDestination, WorkspaceDragDestination, - WorkspaceNodeId, + FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, OutputNode, StackedNode, + TileDragDestination, WorkspaceDragDestination, WorkspaceNodeId, walker::NodeVisitor, }, utils::{copyhashmap::CopyHashMap, linkedlist::LinkedList}, }, diff --git a/src/tree/float.rs b/src/tree/float.rs index 5d42e1e1..53e21f92 100644 --- a/src/tree/float.rs +++ b/src/tree/float.rs @@ -5,8 +5,8 @@ use { cursor_user::CursorUser, fixed::Fixed, ifs::wl_seat::{ + BTN_LEFT, NodeSeatState, SeatId, WlSeatGlobal, tablet::{TabletTool, TabletToolChanges, TabletToolId}, - NodeSeatState, SeatId, WlSeatGlobal, BTN_LEFT, }, rect::Rect, renderer::Renderer, @@ -14,8 +14,8 @@ use { state::State, text::TextTexture, tree::{ - walker::NodeVisitor, ContainingNode, Direction, FindTreeResult, FindTreeUsecase, - FoundNode, Node, NodeId, StackedNode, TileDragDestination, ToplevelNode, WorkspaceNode, + ContainingNode, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + StackedNode, TileDragDestination, ToplevelNode, WorkspaceNode, walker::NodeVisitor, }, utils::{ asyncevent::AsyncEvent, clonecell::CloneCell, double_click_state::DoubleClickState, diff --git a/src/tree/output.rs b/src/tree/output.rs index 5c16ff7a..9dbad4c9 100644 --- a/src/tree/output.rs +++ b/src/tree/output.rs @@ -12,16 +12,15 @@ use { wl_buffer::WlBufferStorage, wl_output::WlOutputGlobal, wl_seat::{ - collect_kb_foci2, + BTN_LEFT, NodeSeatState, SeatId, WlSeatGlobal, collect_kb_foci2, tablet::{TabletTool, TabletToolChanges, TabletToolId}, wl_pointer::PendingScroll, - NodeSeatState, SeatId, WlSeatGlobal, BTN_LEFT, }, wl_surface::{ + SurfaceSendPreferredScaleVisitor, SurfaceSendPreferredTransformVisitor, ext_session_lock_surface_v1::ExtSessionLockSurfaceV1, tray::DynTrayItem, zwlr_layer_surface_v1::{ExclusiveSize, ZwlrLayerSurfaceV1}, - SurfaceSendPreferredScaleVisitor, SurfaceSendPreferredTransformVisitor, }, workspace_manager::{ ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1, @@ -38,9 +37,9 @@ use { state::State, text::TextTexture, tree::{ - walker::NodeVisitor, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, - NodeId, StackedNode, TddType, TileDragDestination, WorkspaceDragDestination, - WorkspaceNode, WorkspaceNodeId, + Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, StackedNode, + TddType, TileDragDestination, WorkspaceDragDestination, WorkspaceNode, WorkspaceNodeId, + walker::NodeVisitor, }, utils::{ asyncevent::AsyncEvent, clonecell::CloneCell, copyhashmap::CopyHashMap, diff --git a/src/tree/placeholder.rs b/src/tree/placeholder.rs index b51bc665..38af76e8 100644 --- a/src/tree/placeholder.rs +++ b/src/tree/placeholder.rs @@ -10,9 +10,9 @@ use { state::State, text::TextTexture, tree::{ - default_tile_drag_destination, ContainerSplit, Direction, FindTreeResult, - FindTreeUsecase, FoundNode, Node, NodeId, NodeVisitor, TileDragDestination, - ToplevelData, ToplevelNode, ToplevelNodeBase, + ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + NodeVisitor, TileDragDestination, ToplevelData, ToplevelNode, ToplevelNodeBase, + default_tile_drag_destination, }, utils::{ asyncevent::AsyncEvent, errorfmt::ErrorFmt, on_drop_event::OnDropEvent, diff --git a/src/tree/toplevel.rs b/src/tree/toplevel.rs index eb274852..37c43c0e 100644 --- a/src/tree/toplevel.rs +++ b/src/tree/toplevel.rs @@ -7,7 +7,7 @@ use { ext_image_copy::ext_image_copy_capture_session_v1::ExtImageCopyCaptureSessionV1, jay_screencast::JayScreencast, jay_toplevel::JayToplevel, - wl_seat::{collect_kb_foci, collect_kb_foci2, NodeSeatState}, + wl_seat::{NodeSeatState, collect_kb_foci, collect_kb_foci2}, wl_surface::WlSurface, }, rect::Rect, @@ -23,7 +23,7 @@ use { hash_map_ext::HashMapExt, numcell::NumCell, threshold_counter::ThresholdCounter, - toplevel_identifier::{toplevel_identifier, ToplevelIdentifier}, + toplevel_identifier::{ToplevelIdentifier, toplevel_identifier}, }, wire::{ ExtForeignToplevelHandleV1Id, ExtImageCopyCaptureSessionV1Id, JayScreencastId, @@ -453,7 +453,9 @@ impl ToplevelData { ws: &Rc, ) { if ws.fullscreen.is_some() { - log::info!("Cannot fullscreen a node on a workspace that already has a fullscreen node attached"); + log::info!( + "Cannot fullscreen a node on a workspace that already has a fullscreen node attached" + ); return; } if node.node_is_placeholder() { @@ -520,11 +522,15 @@ impl ToplevelData { self.is_fullscreen.set(false); match fd.workspace.fullscreen.get() { None => { - log::error!("Node is supposed to be fullscreened on a workspace but workspace has not fullscreen node."); + log::error!( + "Node is supposed to be fullscreened on a workspace but workspace has not fullscreen node." + ); return; } Some(f) if f.tl_as_node().node_id() != node.tl_as_node().node_id() => { - log::error!("Node is supposed to be fullscreened on a workspace but the workspace has a different node attached."); + log::error!( + "Node is supposed to be fullscreened on a workspace but the workspace has a different node attached." + ); return; } _ => {} diff --git a/src/tree/walker.rs b/src/tree/walker.rs index a716f6d0..3408292e 100644 --- a/src/tree/walker.rs +++ b/src/tree/walker.rs @@ -1,12 +1,12 @@ use { crate::{ ifs::wl_surface::{ + WlSurface, ext_session_lock_surface_v1::ExtSessionLockSurfaceV1, tray::jay_tray_item_v1::JayTrayItemV1, x_surface::xwindow::Xwindow, xdg_surface::{xdg_popup::XdgPopup, xdg_toplevel::XdgToplevel}, zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, - WlSurface, }, tree::{ ContainerNode, DisplayNode, FloatNode, Node, OutputNode, PlaceholderNode, WorkspaceNode, diff --git a/src/tree/workspace.rs b/src/tree/workspace.rs index 66eaaef7..d374517e 100644 --- a/src/tree/workspace.rs +++ b/src/tree/workspace.rs @@ -6,9 +6,9 @@ use { ifs::{ jay_workspace::JayWorkspace, wl_output::OutputId, - wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal}, + wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool}, wl_surface::{ - x_surface::xwindow::Xwindow, xdg_surface::xdg_toplevel::XdgToplevel, WlSurface, + WlSurface, x_surface::xwindow::Xwindow, xdg_surface::xdg_toplevel::XdgToplevel, }, workspace_manager::{ ext_workspace_handle_v1::ExtWorkspaceHandleV1, @@ -20,9 +20,9 @@ use { state::State, text::TextTexture, tree::{ - container::ContainerNode, walker::NodeVisitor, ContainingNode, Direction, - FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeVisitorBase, OutputNode, - PlaceholderNode, StackedNode, ToplevelNode, + ContainingNode, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, + NodeVisitorBase, OutputNode, PlaceholderNode, StackedNode, ToplevelNode, + container::ContainerNode, walker::NodeVisitor, }, utils::{ clonecell::CloneCell, diff --git a/src/udev.rs b/src/udev.rs index 29c2746c..c2034d59 100644 --- a/src/udev.rs +++ b/src/udev.rs @@ -4,7 +4,7 @@ use { crate::utils::oserror::OsError, std::{ffi::CStr, marker::PhantomData, ptr, rc::Rc}, thiserror::Error, - uapi::{c, Errno, IntoUstr}, + uapi::{Errno, IntoUstr, c}, }; #[repr(transparent)] @@ -49,7 +49,7 @@ unsafe extern "C" { fn udev_list_entry_get_value(list_entry: *mut udev_list_entry) -> *const c::c_char; fn udev_device_new_from_syspath(udev: *mut udev, syspath: *const c::c_char) - -> *mut udev_device; + -> *mut udev_device; fn udev_device_ref(udev_device: *mut udev_device) -> *mut udev_device; fn udev_device_unref(udev_device: *mut udev_device) -> *mut udev_device; fn udev_device_get_sysname(udev_device: *mut udev_device) -> *const c::c_char; diff --git a/src/udmabuf.rs b/src/udmabuf.rs index 8a25547d..271cdf46 100644 --- a/src/udmabuf.rs +++ b/src/udmabuf.rs @@ -4,20 +4,20 @@ use { format::Format, utils::{oserror::OsError, page_size::page_size}, video::{ + LINEAR_MODIFIER, Modifier, dmabuf::{DmaBuf, DmaBufIds, DmaBufPlane, PlaneVec}, drm::Drm, - Modifier, LINEAR_MODIFIER, }, }, std::{ptr, rc::Rc}, thiserror::Error, uapi::{ - c, + _IOW, OwnedFd, c::{ - ioctl, mmap, munmap, F_SEAL_SHRINK, MAP_SHARED, MFD_ALLOW_SEALING, O_RDONLY, PROT_READ, - PROT_WRITE, + self, F_SEAL_SHRINK, MAP_SHARED, MFD_ALLOW_SEALING, O_RDONLY, PROT_READ, PROT_WRITE, + ioctl, mmap, munmap, }, - map_err, open, OwnedFd, _IOW, + map_err, open, }, }; diff --git a/src/user_session.rs b/src/user_session.rs index b2bad0ce..efffedfd 100644 --- a/src/user_session.rs +++ b/src/user_session.rs @@ -1,6 +1,6 @@ use { crate::{ - dbus::{DbusError, DictEntry, BUS_DEST, BUS_PATH}, + dbus::{BUS_DEST, BUS_PATH, DbusError, DictEntry}, state::State, utils::errorfmt::ErrorFmt, wire_dbus::org, diff --git a/src/utils/activation_token.rs b/src/utils/activation_token.rs index 1e96b4ef..7296b21c 100644 --- a/src/utils/activation_token.rs +++ b/src/utils/activation_token.rs @@ -1,5 +1,5 @@ use { - crate::utils::opaque::{opaque, Opaque, OpaqueError, OPAQUE_LEN}, + crate::utils::opaque::{OPAQUE_LEN, Opaque, OpaqueError, opaque}, arrayvec::ArrayString, std::{ fmt::{Display, Formatter}, diff --git a/src/utils/buffd/buf_in.rs b/src/utils/buffd/buf_in.rs index 346a0dc2..d4c06295 100644 --- a/src/utils/buffd/buf_in.rs +++ b/src/utils/buffd/buf_in.rs @@ -3,7 +3,7 @@ use { io_uring::IoUring, utils::{ buf::Buf, - buffd::{BufFdError, BUF_SIZE, MAX_IN_FD}, + buffd::{BUF_SIZE, BufFdError, MAX_IN_FD}, }, }, smallvec::SmallVec, diff --git a/src/utils/buffd/buf_out.rs b/src/utils/buffd/buf_out.rs index bced6778..b28e5dc9 100644 --- a/src/utils/buffd/buf_out.rs +++ b/src/utils/buffd/buf_out.rs @@ -4,7 +4,7 @@ use { time::Time, utils::{ buf::Buf, - buffd::{BufFdError, BUF_SIZE}, + buffd::{BUF_SIZE, BufFdError}, oserror::OsError, }, }, @@ -13,7 +13,7 @@ use { mem::{self}, rc::Rc, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub(super) const OUT_BUF_SIZE: usize = 2 * BUF_SIZE; @@ -151,7 +151,7 @@ impl BufFdOut { match res { Ok(n) => read_pos += n, Err(IoUringError::OsError(OsError(c::ECONNRESET))) => { - return Err(BufFdError::Closed) + return Err(BufFdError::Closed); } Err(e) => return Err(BufFdError::Io(e)), } diff --git a/src/utils/buffd/ei_formatter.rs b/src/utils/buffd/ei_formatter.rs index 8621da11..af71f627 100644 --- a/src/utils/buffd/ei_formatter.rs +++ b/src/utils/buffd/ei_formatter.rs @@ -1,7 +1,7 @@ use { crate::{ ei::ei_object::EiObjectId, - utils::buffd::buf_out::{MsgFds, OutBuffer, OutBufferMeta, OUT_BUF_SIZE}, + utils::buffd::buf_out::{MsgFds, OUT_BUF_SIZE, OutBuffer, OutBufferMeta}, }, std::{mem, rc::Rc}, uapi::OwnedFd, diff --git a/src/utils/buffd/formatter.rs b/src/utils/buffd/formatter.rs index 5dde8f86..35f07e7f 100644 --- a/src/utils/buffd/formatter.rs +++ b/src/utils/buffd/formatter.rs @@ -2,7 +2,7 @@ use { crate::{ fixed::Fixed, object::ObjectId, - utils::buffd::buf_out::{MsgFds, OutBuffer, OutBufferMeta, OUT_BUF_SIZE}, + utils::buffd::buf_out::{MsgFds, OUT_BUF_SIZE, OutBuffer, OutBufferMeta}, }, std::{mem, rc::Rc}, uapi::{OwnedFd, Packed}, diff --git a/src/utils/bufio.rs b/src/utils/bufio.rs index f47c8f2b..5cbd5260 100644 --- a/src/utils/bufio.rs +++ b/src/utils/bufio.rs @@ -13,7 +13,7 @@ use { rc::Rc, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/utils/clone3.rs b/src/utils/clone3.rs index a474b36f..a861134b 100644 --- a/src/utils/clone3.rs +++ b/src/utils/clone3.rs @@ -1,6 +1,6 @@ use { crate::forker::ForkerError, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Default, Copy, Clone)] diff --git a/src/utils/fdcloser.rs b/src/utils/fdcloser.rs index 32bb80aa..922ae980 100644 --- a/src/utils/fdcloser.rs +++ b/src/utils/fdcloser.rs @@ -43,7 +43,9 @@ impl FdCloser { self.cv.notify_all(); } Err(_e) => { - log::warn!("Could not close file descriptor in separate thread. There are still references."); + log::warn!( + "Could not close file descriptor in separate thread. There are still references." + ); } } } diff --git a/src/utils/num_cpus.rs b/src/utils/num_cpus.rs index 53e576f7..1c1d00a5 100644 --- a/src/utils/num_cpus.rs +++ b/src/utils/num_cpus.rs @@ -1,7 +1,7 @@ use { crate::utils::oserror::OsError, - smallvec::{smallvec_inline, SmallVec}, - uapi::{c, Errno}, + smallvec::{SmallVec, smallvec_inline}, + uapi::{Errno, c}, }; #[cfg_attr(not(feature = "it"), expect(dead_code))] diff --git a/src/utils/opaque.rs b/src/utils/opaque.rs index bed437f7..ac6094b5 100644 --- a/src/utils/opaque.rs +++ b/src/utils/opaque.rs @@ -1,7 +1,7 @@ use { arrayvec::ArrayString, - rand::{thread_rng, Rng}, - serde::{de, Deserialize, Deserializer, Serialize, Serializer}, + rand::{Rng, thread_rng}, + serde::{Deserialize, Deserializer, Serialize, Serializer, de}, std::{ fmt::{Debug, Display, Formatter}, num::ParseIntError, diff --git a/src/utils/oserror.rs b/src/utils/oserror.rs index 8fafdc15..62a3d944 100644 --- a/src/utils/oserror.rs +++ b/src/utils/oserror.rs @@ -4,7 +4,10 @@ use { error::Error, fmt::{Display, Formatter}, }, - uapi::{c, c::c_int, Errno}, + uapi::{ + Errno, + c::{self, c_int}, + }, }; static ERRORS: Lazy<&'static [Option<&'static str>]> = Lazy::new(|| { diff --git a/src/utils/pid_info.rs b/src/utils/pid_info.rs index f5197a96..d2c672c4 100644 --- a/src/utils/pid_info.rs +++ b/src/utils/pid_info.rs @@ -1,7 +1,7 @@ use { crate::utils::{errorfmt::ErrorFmt, oserror::OsError}, bstr::ByteSlice, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub struct PidInfo { diff --git a/src/utils/process_name.rs b/src/utils/process_name.rs index 2f7ab4c2..f274ff68 100644 --- a/src/utils/process_name.rs +++ b/src/utils/process_name.rs @@ -1,4 +1,4 @@ -use uapi::{c, IntoUstr}; +use uapi::{IntoUstr, c}; pub fn set_process_name(name: &str) { unsafe { diff --git a/src/utils/scroller.rs b/src/utils/scroller.rs index 0429b1d3..0fd6d2b6 100644 --- a/src/utils/scroller.rs +++ b/src/utils/scroller.rs @@ -2,8 +2,8 @@ use { crate::{ backend::AXIS_120, ifs::wl_seat::{ - wl_pointer::{PendingScroll, VERTICAL_SCROLL}, PX_PER_SCROLL, + wl_pointer::{PendingScroll, VERTICAL_SCROLL}, }, }, std::cell::Cell, @@ -38,10 +38,6 @@ impl Scroller { self.v120.set(0); self.px.set(0.0); } - if n != 0 { - Some(n) - } else { - None - } + if n != 0 { Some(n) } else { None } } } diff --git a/src/utils/threshold_counter.rs b/src/utils/threshold_counter.rs index 3fe6f14b..fc227f4a 100644 --- a/src/utils/threshold_counter.rs +++ b/src/utils/threshold_counter.rs @@ -15,11 +15,7 @@ impl ThresholdCounter { } pub fn adj(&self, inc: bool) -> bool { - if inc { - self.inc() - } else { - self.dec() - } + if inc { self.inc() } else { self.dec() } } pub fn active(&self) -> bool { diff --git a/src/utils/timer.rs b/src/utils/timer.rs index 05a53a79..04a0fa9b 100644 --- a/src/utils/timer.rs +++ b/src/utils/timer.rs @@ -5,7 +5,7 @@ use { }, std::{cell::RefCell, rc::Rc, time::Duration}, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/utils/toplevel_identifier.rs b/src/utils/toplevel_identifier.rs index 61f44f2f..0825e299 100644 --- a/src/utils/toplevel_identifier.rs +++ b/src/utils/toplevel_identifier.rs @@ -1,5 +1,5 @@ use { - crate::utils::opaque::{opaque, Opaque, OpaqueError, OPAQUE_LEN}, + crate::utils::opaque::{OPAQUE_LEN, Opaque, OpaqueError, opaque}, arrayvec::ArrayString, std::{ fmt::{Display, Formatter}, diff --git a/src/utils/transform_ext.rs b/src/utils/transform_ext.rs index f7b965d0..0506bf42 100644 --- a/src/utils/transform_ext.rs +++ b/src/utils/transform_ext.rs @@ -1,11 +1,11 @@ use { crate::ifs::wl_output::{ - TF_180, TF_270, TF_90, TF_FLIPPED, TF_FLIPPED_180, TF_FLIPPED_270, TF_FLIPPED_90, TF_NORMAL, + TF_90, TF_180, TF_270, TF_FLIPPED, TF_FLIPPED_90, TF_FLIPPED_180, TF_FLIPPED_270, TF_NORMAL, }, jay_config::video::{ Transform, Transform::{ - Flip, FlipRotate180, FlipRotate270, FlipRotate90, None, Rotate180, Rotate270, Rotate90, + Flip, FlipRotate90, FlipRotate180, FlipRotate270, None, Rotate90, Rotate180, Rotate270, }, }, }; diff --git a/src/video/dmabuf.rs b/src/video/dmabuf.rs index ff474cee..b31b280e 100644 --- a/src/video/dmabuf.rs +++ b/src/video/dmabuf.rs @@ -2,7 +2,7 @@ use { crate::{format::Format, utils::oserror::OsError, video::Modifier}, arrayvec::ArrayVec, std::rc::Rc, - uapi::{c::ioctl, OwnedFd, _IOW, _IOWR}, + uapi::{_IOW, _IOWR, OwnedFd, c::ioctl}, }; #[derive(Clone, Debug)] diff --git a/src/video/drm.rs b/src/video/drm.rs index 2e637dd2..b5f97698 100644 --- a/src/video/drm.rs +++ b/src/video/drm.rs @@ -6,15 +6,15 @@ use { crate::{ utils::oserror::OsError, video::drm::sys::{ - create_lease, drm_event, drm_event_vblank, gem_close, get_cap, - get_device_name_from_fd2, get_minor_name_from_fd, get_node_type_from_fd, get_nodes, - mode_addfb2, mode_atomic, mode_create_blob, mode_destroy_blob, mode_get_resources, - mode_getconnector, mode_getencoder, mode_getplane, mode_getplaneresources, - mode_getprobblob, mode_getproperty, mode_obj_getproperties, mode_rmfb, - prime_fd_to_handle, set_client_cap, DRM_DISPLAY_MODE_LEN, DRM_MODE_ATOMIC_TEST_ONLY, - DRM_MODE_FB_MODIFIERS, DRM_MODE_OBJECT_BLOB, DRM_MODE_OBJECT_CONNECTOR, - DRM_MODE_OBJECT_CRTC, DRM_MODE_OBJECT_ENCODER, DRM_MODE_OBJECT_FB, - DRM_MODE_OBJECT_MODE, DRM_MODE_OBJECT_PLANE, DRM_MODE_OBJECT_PROPERTY, + DRM_DISPLAY_MODE_LEN, DRM_MODE_ATOMIC_TEST_ONLY, DRM_MODE_FB_MODIFIERS, + DRM_MODE_OBJECT_BLOB, DRM_MODE_OBJECT_CONNECTOR, DRM_MODE_OBJECT_CRTC, + DRM_MODE_OBJECT_ENCODER, DRM_MODE_OBJECT_FB, DRM_MODE_OBJECT_MODE, + DRM_MODE_OBJECT_PLANE, DRM_MODE_OBJECT_PROPERTY, create_lease, drm_event, + drm_event_vblank, gem_close, get_cap, get_device_name_from_fd2, get_minor_name_from_fd, + get_node_type_from_fd, get_nodes, mode_addfb2, mode_atomic, mode_create_blob, + mode_destroy_blob, mode_get_resources, mode_getconnector, mode_getencoder, + mode_getplane, mode_getplaneresources, mode_getprobblob, mode_getproperty, + mode_obj_getproperties, mode_rmfb, prime_fd_to_handle, set_client_cap, }, }, ahash::AHashMap, @@ -29,7 +29,7 @@ use { rc::{Rc, Weak}, }, thiserror::Error, - uapi::{c, OwnedFd, Pod, Ustring}, + uapi::{OwnedFd, Pod, Ustring, c}, }; use crate::{ @@ -38,18 +38,18 @@ use crate::{ io_uring::{IoUring, IoUringError}, utils::{buf::Buf, errorfmt::ErrorFmt, stack::Stack, syncqueue::SyncQueue, vec_ext::VecExt}, video::{ + INVALID_MODIFIER, Modifier, dmabuf::DmaBuf, drm::sys::{ - auth_magic, drm_event_crtc_sequence, drm_format_modifier, drm_format_modifier_blob, - drop_master, get_version, queue_sequence, revoke_lease, DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP, - DRM_CAP_CURSOR_HEIGHT, DRM_CAP_CURSOR_WIDTH, FORMAT_BLOB_CURRENT, + DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP, DRM_CAP_CURSOR_HEIGHT, DRM_CAP_CURSOR_WIDTH, + FORMAT_BLOB_CURRENT, auth_magic, drm_event_crtc_sequence, drm_format_modifier, + drm_format_modifier_blob, drop_master, get_version, queue_sequence, revoke_lease, }, - Modifier, INVALID_MODIFIER, }, }; pub use sys::{ - drm_mode_modeinfo, DRM_CLIENT_CAP_ATOMIC, DRM_MODE_ATOMIC_ALLOW_MODESET, - DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_ASYNC, DRM_MODE_PAGE_FLIP_EVENT, + DRM_CLIENT_CAP_ATOMIC, DRM_MODE_ATOMIC_ALLOW_MODESET, DRM_MODE_ATOMIC_NONBLOCK, + DRM_MODE_PAGE_FLIP_ASYNC, DRM_MODE_PAGE_FLIP_EVENT, drm_mode_modeinfo, }; #[derive(Debug, Error)] diff --git a/src/video/drm/sync_obj.rs b/src/video/drm/sync_obj.rs index 39c1b6ec..7b04fd9f 100644 --- a/src/video/drm/sync_obj.rs +++ b/src/video/drm/sync_obj.rs @@ -10,21 +10,21 @@ use { oserror::OsError, }, video::drm::{ + DrmError, sys::{ - sync_ioc_merge, sync_obj_create, sync_obj_destroy, sync_obj_eventfd, - sync_obj_fd_to_handle, sync_obj_handle_to_fd, sync_obj_signal, sync_obj_transfer, DRM_SYNCOBJ_CREATE_SIGNALED, DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE, DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE, - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE, + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE, sync_ioc_merge, sync_obj_create, + sync_obj_destroy, sync_obj_eventfd, sync_obj_fd_to_handle, sync_obj_handle_to_fd, + sync_obj_signal, sync_obj_transfer, }, - DrmError, }, }, std::{ rc::Rc, sync::atomic::{AtomicU64, Ordering::Relaxed}, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; static SYNCOBJ_ID: AtomicU64 = AtomicU64::new(0); diff --git a/src/video/drm/sys.rs b/src/video/drm/sys.rs index c17b63bd..4a59ecba 100644 --- a/src/video/drm/sys.rs +++ b/src/video/drm/sys.rs @@ -17,7 +17,7 @@ use { ffi::CString, io::{BufRead, BufReader}, }, - uapi::{c, pod_zeroed, OwnedFd, Pod, Ustring}, + uapi::{OwnedFd, Pod, Ustring, c, pod_zeroed}, }; pub unsafe fn ioctl(fd: c::c_int, request: c::c_ulong, t: &mut T) -> Result { diff --git a/src/video/drm/wait_for_sync_obj.rs b/src/video/drm/wait_for_sync_obj.rs index 39f95e6a..58be19e5 100644 --- a/src/video/drm/wait_for_sync_obj.rs +++ b/src/video/drm/wait_for_sync_obj.rs @@ -7,12 +7,12 @@ use { hash_map_ext::HashMapExt, numcell::NumCell, oserror::OsError, stack::Stack, }, video::drm::{ - sync_obj::{SyncObj, SyncObjCtx, SyncObjPoint}, DrmError, + sync_obj::{SyncObj, SyncObjCtx, SyncObjPoint}, }, }, std::{cell::Cell, rc::Rc}, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub struct WaitForSyncObj { diff --git a/src/video/gbm.rs b/src/video/gbm.rs index 09caf304..4d88814b 100644 --- a/src/video/gbm.rs +++ b/src/video/gbm.rs @@ -3,15 +3,16 @@ use { crate::{ allocator::{ - Allocator, AllocatorError, BufferObject, BufferUsage, MappedBuffer, BO_USE_CURSOR, - BO_USE_LINEAR, BO_USE_PROTECTED, BO_USE_RENDERING, BO_USE_SCANOUT, BO_USE_WRITE, + Allocator, AllocatorError, BO_USE_CURSOR, BO_USE_LINEAR, BO_USE_PROTECTED, + BO_USE_RENDERING, BO_USE_SCANOUT, BO_USE_WRITE, BufferObject, BufferUsage, + MappedBuffer, }, - format::{formats, Format}, + format::{Format, formats}, utils::oserror::OsError, video::{ + INVALID_MODIFIER, Modifier, dmabuf::{DmaBuf, DmaBufIds, DmaBufPlane, PlaneVec}, drm::{Drm, DrmError}, - Modifier, INVALID_MODIFIER, }, }, std::{ @@ -21,7 +22,7 @@ use { slice, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/wheel.rs b/src/wheel.rs index 2001cc01..be9c4ebf 100644 --- a/src/wheel.rs +++ b/src/wheel.rs @@ -19,7 +19,7 @@ use { time::Duration, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; #[derive(Debug, Error)] diff --git a/src/wl_usr.rs b/src/wl_usr.rs index 0dfc3cfd..35f76b93 100644 --- a/src/wl_usr.rs +++ b/src/wl_usr.rs @@ -4,7 +4,7 @@ pub mod usr_object; use { crate::{ async_engine::{AsyncEngine, SpawnedFuture}, - client::{EventFormatter, RequestParser, MIN_SERVER_ID}, + client::{EventFormatter, MIN_SERVER_ID, RequestParser}, io_uring::{IoUring, IoUringError}, object::{Interface, ObjectId, Version, WL_DISPLAY_ID}, utils::{ diff --git a/src/wl_usr/usr_ifs/usr_jay_compositor.rs b/src/wl_usr/usr_ifs/usr_jay_compositor.rs index 8642e533..186e8e4c 100644 --- a/src/wl_usr/usr_ifs/usr_jay_compositor.rs +++ b/src/wl_usr/usr_ifs/usr_jay_compositor.rs @@ -3,8 +3,9 @@ use { ifs::jay_compositor::Cap, object::Version, utils::clonecell::CloneCell, - wire::{jay_compositor::*, JayCompositorId}, + wire::{JayCompositorId, jay_compositor::*}, wl_usr::{ + UsrCon, usr_ifs::{ usr_jay_ei_session_builder::UsrJayEiSessionBuilder, usr_jay_output::UsrJayOutput, usr_jay_pointer::UsrJayPointer, usr_jay_render_ctx::UsrJayRenderCtx, @@ -15,7 +16,6 @@ use { usr_wl_seat::UsrWlSeat, }, usr_object::UsrObject, - UsrCon, }, }, std::{cell::Cell, convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_jay_ei_session.rs b/src/wl_usr/usr_ifs/usr_jay_ei_session.rs index 558398d6..cb398d6b 100644 --- a/src/wl_usr/usr_ifs/usr_jay_ei_session.rs +++ b/src/wl_usr/usr_ifs/usr_jay_ei_session.rs @@ -3,10 +3,10 @@ use { object::Version, utils::clonecell::CloneCell, wire::{ - jay_ei_session::{Created, Destroyed, Failed, JayEiSessionEventHandler, Release}, JayEiSessionId, + jay_ei_session::{Created, Destroyed, Failed, JayEiSessionEventHandler, Release}, }, - wl_usr::{usr_object::UsrObject, UsrCon}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, uapi::OwnedFd, diff --git a/src/wl_usr/usr_ifs/usr_jay_ei_session_builder.rs b/src/wl_usr/usr_ifs/usr_jay_ei_session_builder.rs index f3b4612b..fa514331 100644 --- a/src/wl_usr/usr_ifs/usr_jay_ei_session_builder.rs +++ b/src/wl_usr/usr_ifs/usr_jay_ei_session_builder.rs @@ -2,10 +2,10 @@ use { crate::{ object::Version, wire::{ - jay_ei_session_builder::{Commit, JayEiSessionBuilderEventHandler, SetAppId}, JayEiSessionBuilderId, + jay_ei_session_builder::{Commit, JayEiSessionBuilderEventHandler, SetAppId}, }, - wl_usr::{usr_ifs::usr_jay_ei_session::UsrJayEiSession, usr_object::UsrObject, UsrCon}, + wl_usr::{UsrCon, usr_ifs::usr_jay_ei_session::UsrJayEiSession, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_jay_output.rs b/src/wl_usr/usr_ifs/usr_jay_output.rs index 186927a6..72face09 100644 --- a/src/wl_usr/usr_ifs/usr_jay_output.rs +++ b/src/wl_usr/usr_ifs/usr_jay_output.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{jay_output::*, JayOutputId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{JayOutputId, jay_output::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_jay_pointer.rs b/src/wl_usr/usr_ifs/usr_jay_pointer.rs index 1013ddc2..830c63b8 100644 --- a/src/wl_usr/usr_ifs/usr_jay_pointer.rs +++ b/src/wl_usr/usr_ifs/usr_jay_pointer.rs @@ -2,8 +2,8 @@ use { crate::{ cursor::KnownCursor, object::Version, - wire::{jay_pointer::*, JayPointerId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{JayPointerId, jay_pointer::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_jay_render_ctx.rs b/src/wl_usr/usr_ifs/usr_jay_render_ctx.rs index db3dcb89..0938a3ea 100644 --- a/src/wl_usr/usr_ifs/usr_jay_render_ctx.rs +++ b/src/wl_usr/usr_ifs/usr_jay_render_ctx.rs @@ -6,8 +6,8 @@ use { object::Version, utils::clonecell::CloneCell, video::Modifier, - wire::{jay_render_ctx::*, JayRenderCtxId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{JayRenderCtxId, jay_render_ctx::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, ahash::AHashMap, std::{cell::RefCell, convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_jay_screencast.rs b/src/wl_usr/usr_ifs/usr_jay_screencast.rs index ad150315..31c86fad 100644 --- a/src/wl_usr/usr_ifs/usr_jay_screencast.rs +++ b/src/wl_usr/usr_ifs/usr_jay_screencast.rs @@ -4,14 +4,14 @@ use { object::Version, utils::clonecell::CloneCell, video::dmabuf::{DmaBuf, DmaBufPlane, PlaneVec}, - wire::{jay_screencast::*, JayScreencastId}, + wire::{JayScreencastId, jay_screencast::*}, wl_usr::{ + UsrCon, usr_ifs::{ usr_jay_output::UsrJayOutput, usr_jay_toplevel::UsrJayToplevel, usr_jay_workspace::UsrJayWorkspace, usr_wl_buffer::UsrWlBuffer, }, usr_object::UsrObject, - UsrCon, }, }, std::{cell::RefCell, mem, ops::DerefMut, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs b/src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs index 2d10ba32..0d562806 100644 --- a/src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs +++ b/src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs @@ -3,11 +3,11 @@ use { ifs::jay_toplevel::ID_SINCE, object::Version, utils::clonecell::CloneCell, - wire::{jay_select_toplevel::*, JaySelectToplevelId}, + wire::{JaySelectToplevelId, jay_select_toplevel::*}, wl_usr::{ + UsrCon, usr_ifs::usr_jay_toplevel::{UsrJayToplevel, UsrJayToplevelOwner}, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_jay_select_workspace.rs b/src/wl_usr/usr_ifs/usr_jay_select_workspace.rs index 5d59ecd6..f7ea6fa8 100644 --- a/src/wl_usr/usr_ifs/usr_jay_select_workspace.rs +++ b/src/wl_usr/usr_ifs/usr_jay_select_workspace.rs @@ -2,11 +2,11 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{jay_select_workspace::*, JaySelectWorkspaceId}, + wire::{JaySelectWorkspaceId, jay_select_workspace::*}, wl_usr::{ + UsrCon, usr_ifs::usr_jay_workspace::{UsrJayWorkspace, UsrJayWorkspaceOwner}, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_jay_toplevel.rs b/src/wl_usr/usr_ifs/usr_jay_toplevel.rs index 11b9900c..99ad10f6 100644 --- a/src/wl_usr/usr_ifs/usr_jay_toplevel.rs +++ b/src/wl_usr/usr_ifs/usr_jay_toplevel.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{jay_toplevel::*, JayToplevelId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{JayToplevelId, jay_toplevel::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{cell::RefCell, convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_jay_workspace.rs b/src/wl_usr/usr_ifs/usr_jay_workspace.rs index 1e88c196..d1f3ca7b 100644 --- a/src/wl_usr/usr_ifs/usr_jay_workspace.rs +++ b/src/wl_usr/usr_ifs/usr_jay_workspace.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{jay_workspace::*, JayWorkspaceId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{JayWorkspaceId, jay_workspace::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{ cell::{Cell, RefCell}, diff --git a/src/wl_usr/usr_ifs/usr_jay_workspace_watcher.rs b/src/wl_usr/usr_ifs/usr_jay_workspace_watcher.rs index e7f5894e..186a4579 100644 --- a/src/wl_usr/usr_ifs/usr_jay_workspace_watcher.rs +++ b/src/wl_usr/usr_ifs/usr_jay_workspace_watcher.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{jay_workspace_watcher::*, JayWorkspaceWatcherId}, - wl_usr::{usr_ifs::usr_jay_workspace::UsrJayWorkspace, usr_object::UsrObject, UsrCon}, + wire::{JayWorkspaceWatcherId, jay_workspace_watcher::*}, + wl_usr::{UsrCon, usr_ifs::usr_jay_workspace::UsrJayWorkspace, usr_object::UsrObject}, }, std::{convert::Infallible, ops::Deref, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_linux_buffer_params.rs b/src/wl_usr/usr_ifs/usr_linux_buffer_params.rs index 3b7d699d..a9e9551f 100644 --- a/src/wl_usr/usr_ifs/usr_linux_buffer_params.rs +++ b/src/wl_usr/usr_ifs/usr_linux_buffer_params.rs @@ -3,8 +3,8 @@ use { object::Version, utils::clonecell::CloneCell, video::dmabuf::DmaBuf, - wire::{zwp_linux_buffer_params_v1::*, ZwpLinuxBufferParamsV1Id}, - wl_usr::{usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject, UsrCon}, + wire::{ZwpLinuxBufferParamsV1Id, zwp_linux_buffer_params_v1::*}, + wl_usr::{UsrCon, usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject}, }, std::{convert::Infallible, ops::Deref, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs b/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs index 525c4ef5..e3e0a0e5 100644 --- a/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs +++ b/src/wl_usr/usr_ifs/usr_linux_dmabuf.rs @@ -1,14 +1,14 @@ use { crate::{ - format::{formats, Format}, + format::{Format, formats}, object::Version, utils::clonecell::CloneCell, wire::{ - zwp_linux_dmabuf_v1::{self, *}, ZwpLinuxDmabufV1Id, + zwp_linux_dmabuf_v1::{self, *}, }, wl_usr::{ - usr_ifs::usr_linux_buffer_params::UsrLinuxBufferParams, usr_object::UsrObject, UsrCon, + UsrCon, usr_ifs::usr_linux_buffer_params::UsrLinuxBufferParams, usr_object::UsrObject, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_wl_buffer.rs b/src/wl_usr/usr_ifs/usr_wl_buffer.rs index 4acd8768..fcbc9521 100644 --- a/src/wl_usr/usr_ifs/usr_wl_buffer.rs +++ b/src/wl_usr/usr_ifs/usr_wl_buffer.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{wl_buffer::*, WlBufferId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlBufferId, wl_buffer::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_callback.rs b/src/wl_usr/usr_ifs/usr_wl_callback.rs index b0663bcd..eaa4e5fd 100644 --- a/src/wl_usr/usr_ifs/usr_wl_callback.rs +++ b/src/wl_usr/usr_ifs/usr_wl_callback.rs @@ -1,8 +1,8 @@ use { crate::{ object::Version, - wire::{wl_callback::*, WlCallbackId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlCallbackId, wl_callback::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{cell::Cell, convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_compositor.rs b/src/wl_usr/usr_ifs/usr_wl_compositor.rs index e9d9be87..8c7ebeb5 100644 --- a/src/wl_usr/usr_ifs/usr_wl_compositor.rs +++ b/src/wl_usr/usr_ifs/usr_wl_compositor.rs @@ -2,10 +2,10 @@ use { crate::{ object::Version, wire::{ - wl_compositor::{CreateSurface, WlCompositorEventHandler}, WlCompositorId, + wl_compositor::{CreateSurface, WlCompositorEventHandler}, }, - wl_usr::{usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject, UsrCon}, + wl_usr::{UsrCon, usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_display.rs b/src/wl_usr/usr_ifs/usr_wl_display.rs index 2b4bca47..a780d8f7 100644 --- a/src/wl_usr/usr_ifs/usr_wl_display.rs +++ b/src/wl_usr/usr_ifs/usr_wl_display.rs @@ -1,8 +1,8 @@ use { crate::{ object::Version, - wire::{wl_display::*, WlDisplayId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlDisplayId, wl_display::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::rc::Rc, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_output.rs b/src/wl_usr/usr_ifs/usr_wl_output.rs index f4d1ae20..51804e4e 100644 --- a/src/wl_usr/usr_ifs/usr_wl_output.rs +++ b/src/wl_usr/usr_ifs/usr_wl_output.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{wl_output::*, WlOutputId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlOutputId, wl_output::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{cell::RefCell, convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_pointer.rs b/src/wl_usr/usr_ifs/usr_wl_pointer.rs index 55153bd3..d4220d97 100644 --- a/src/wl_usr/usr_ifs/usr_wl_pointer.rs +++ b/src/wl_usr/usr_ifs/usr_wl_pointer.rs @@ -3,8 +3,8 @@ use { ifs::wl_seat::wl_pointer::PendingScroll, object::Version, utils::clonecell::CloneCell, - wire::{wl_pointer::*, WlPointerId}, - wl_usr::{usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject, UsrCon}, + wire::{WlPointerId, wl_pointer::*}, + wl_usr::{UsrCon, usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject}, }, std::{cell::Cell, convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_registry.rs b/src/wl_usr/usr_ifs/usr_wl_registry.rs index 011c97ab..223800c6 100644 --- a/src/wl_usr/usr_ifs/usr_wl_registry.rs +++ b/src/wl_usr/usr_ifs/usr_wl_registry.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{wl_registry::*, WlRegistryId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlRegistryId, wl_registry::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_seat.rs b/src/wl_usr/usr_ifs/usr_wl_seat.rs index 602eb820..82db0a05 100644 --- a/src/wl_usr/usr_ifs/usr_wl_seat.rs +++ b/src/wl_usr/usr_ifs/usr_wl_seat.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{wl_seat::*, WlSeatId}, - wl_usr::{usr_ifs::usr_wl_pointer::UsrWlPointer, usr_object::UsrObject, UsrCon}, + wire::{WlSeatId, wl_seat::*}, + wl_usr::{UsrCon, usr_ifs::usr_wl_pointer::UsrWlPointer, usr_object::UsrObject}, }, std::{cell::Cell, convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_shm.rs b/src/wl_usr/usr_ifs/usr_wl_shm.rs index 0218dd1a..ee70a690 100644 --- a/src/wl_usr/usr_ifs/usr_wl_shm.rs +++ b/src/wl_usr/usr_ifs/usr_wl_shm.rs @@ -3,8 +3,8 @@ use { format::{formats, map_wayland_format_id}, object::Version, utils::copyhashmap::CopyHashMap, - wire::{wl_shm::*, WlShmId}, - wl_usr::{usr_ifs::usr_wl_shm_pool::UsrWlShmPool, usr_object::UsrObject, UsrCon}, + wire::{WlShmId, wl_shm::*}, + wl_usr::{UsrCon, usr_ifs::usr_wl_shm_pool::UsrWlShmPool, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, uapi::OwnedFd, diff --git a/src/wl_usr/usr_ifs/usr_wl_shm_pool.rs b/src/wl_usr/usr_ifs/usr_wl_shm_pool.rs index c436c04d..de6ce31b 100644 --- a/src/wl_usr/usr_ifs/usr_wl_shm_pool.rs +++ b/src/wl_usr/usr_ifs/usr_wl_shm_pool.rs @@ -1,8 +1,8 @@ use { crate::{ object::Version, - wire::{wl_shm_pool::*, WlShmPoolId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WlShmPoolId, wl_shm_pool::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wl_surface.rs b/src/wl_usr/usr_ifs/usr_wl_surface.rs index 7d72e3eb..070bc298 100644 --- a/src/wl_usr/usr_ifs/usr_wl_surface.rs +++ b/src/wl_usr/usr_ifs/usr_wl_surface.rs @@ -1,11 +1,11 @@ use { crate::{ object::Version, - wire::{wl_surface::*, WlSurfaceId}, + wire::{WlSurfaceId, wl_surface::*}, wl_usr::{ + UsrCon, usr_ifs::{usr_wl_buffer::UsrWlBuffer, usr_wl_callback::UsrWlCallback}, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_wlr_layer_shell.rs b/src/wl_usr/usr_ifs/usr_wlr_layer_shell.rs index 05dca20c..313d9a42 100644 --- a/src/wl_usr/usr_ifs/usr_wlr_layer_shell.rs +++ b/src/wl_usr/usr_ifs/usr_wlr_layer_shell.rs @@ -1,14 +1,14 @@ use { crate::{ object::Version, - wire::{zwlr_layer_shell_v1::*, ZwlrLayerShellV1Id}, + wire::{ZwlrLayerShellV1Id, zwlr_layer_shell_v1::*}, wl_usr::{ + UsrCon, usr_ifs::{ usr_wl_output::UsrWlOutput, usr_wl_surface::UsrWlSurface, usr_wlr_layer_surface::UsrWlrLayerSurface, }, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_wlr_layer_surface.rs b/src/wl_usr/usr_ifs/usr_wlr_layer_surface.rs index e6871c38..e6ecfe0c 100644 --- a/src/wl_usr/usr_ifs/usr_wlr_layer_surface.rs +++ b/src/wl_usr/usr_ifs/usr_wlr_layer_surface.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{zwlr_layer_surface_v1::*, ZwlrLayerSurfaceV1Id}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{ZwlrLayerSurfaceV1Id, zwlr_layer_surface_v1::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wp_fractional_scale.rs b/src/wl_usr/usr_ifs/usr_wp_fractional_scale.rs index aead1783..a3ffbee2 100644 --- a/src/wl_usr/usr_ifs/usr_wp_fractional_scale.rs +++ b/src/wl_usr/usr_ifs/usr_wp_fractional_scale.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{wp_fractional_scale_v1::*, WpFractionalScaleV1Id}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WpFractionalScaleV1Id, wp_fractional_scale_v1::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wp_fractional_scale_manager.rs b/src/wl_usr/usr_ifs/usr_wp_fractional_scale_manager.rs index c5d2ed11..b61b2d53 100644 --- a/src/wl_usr/usr_ifs/usr_wp_fractional_scale_manager.rs +++ b/src/wl_usr/usr_ifs/usr_wp_fractional_scale_manager.rs @@ -1,13 +1,13 @@ use { crate::{ object::Version, - wire::{wp_fractional_scale_manager_v1::*, WpFractionalScaleManagerV1Id}, + wire::{WpFractionalScaleManagerV1Id, wp_fractional_scale_manager_v1::*}, wl_usr::{ + UsrCon, usr_ifs::{ usr_wl_surface::UsrWlSurface, usr_wp_fractional_scale::UsrWpFractionalScale, }, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_wp_viewport.rs b/src/wl_usr/usr_ifs/usr_wp_viewport.rs index afd43283..b336b4a1 100644 --- a/src/wl_usr/usr_ifs/usr_wp_viewport.rs +++ b/src/wl_usr/usr_ifs/usr_wp_viewport.rs @@ -2,8 +2,8 @@ use { crate::{ fixed::Fixed, object::Version, - wire::{wp_viewport::*, WpViewportId}, - wl_usr::{usr_object::UsrObject, UsrCon}, + wire::{WpViewportId, wp_viewport::*}, + wl_usr::{UsrCon, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_wp_viewporter.rs b/src/wl_usr/usr_ifs/usr_wp_viewporter.rs index aecc2f03..073b4be3 100644 --- a/src/wl_usr/usr_ifs/usr_wp_viewporter.rs +++ b/src/wl_usr/usr_ifs/usr_wp_viewporter.rs @@ -1,11 +1,11 @@ use { crate::{ object::Version, - wire::{wp_viewporter::*, WpViewporterId}, + wire::{WpViewporterId, wp_viewporter::*}, wl_usr::{ + UsrCon, usr_ifs::{usr_wl_surface::UsrWlSurface, usr_wp_viewport::UsrWpViewport}, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/wl_usr/usr_ifs/usr_zwlr_screencopy_frame.rs b/src/wl_usr/usr_ifs/usr_zwlr_screencopy_frame.rs index ca061c01..cd1f41d7 100644 --- a/src/wl_usr/usr_ifs/usr_zwlr_screencopy_frame.rs +++ b/src/wl_usr/usr_ifs/usr_zwlr_screencopy_frame.rs @@ -2,8 +2,8 @@ use { crate::{ object::Version, utils::clonecell::CloneCell, - wire::{zwlr_screencopy_frame_v1::*, ZwlrScreencopyFrameV1Id}, - wl_usr::{usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject, UsrCon}, + wire::{ZwlrScreencopyFrameV1Id, zwlr_screencopy_frame_v1::*}, + wl_usr::{UsrCon, usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject}, }, std::{convert::Infallible, rc::Rc}, }; diff --git a/src/wl_usr/usr_ifs/usr_zwlr_screencopy_manager.rs b/src/wl_usr/usr_ifs/usr_zwlr_screencopy_manager.rs index 2d608058..ef7501b0 100644 --- a/src/wl_usr/usr_ifs/usr_zwlr_screencopy_manager.rs +++ b/src/wl_usr/usr_ifs/usr_zwlr_screencopy_manager.rs @@ -1,13 +1,13 @@ use { crate::{ object::Version, - wire::{zwlr_screencopy_manager_v1::*, ZwlrScreencopyManagerV1Id}, + wire::{ZwlrScreencopyManagerV1Id, zwlr_screencopy_manager_v1::*}, wl_usr::{ + UsrCon, usr_ifs::{ usr_wl_output::UsrWlOutput, usr_zwlr_screencopy_frame::UsrZwlrScreencopyFrame, }, usr_object::UsrObject, - UsrCon, }, }, std::{convert::Infallible, rc::Rc}, diff --git a/src/xcon.rs b/src/xcon.rs index 8e23d7b3..7a67f827 100644 --- a/src/xcon.rs +++ b/src/xcon.rs @@ -21,16 +21,16 @@ use { vec_ext::VecExt, }, wire_xcon::{ - CreateGC, CreatePixmap, Extension, FreeGC, FreePixmap, GetInputFocus, GetProperty, - ListExtensions, PutImage, QueryExtension, RenderCreateCursor, RenderCreatePicture, - RenderQueryPictFormats, Setup, EXTENSIONS, + CreateGC, CreatePixmap, EXTENSIONS, Extension, FreeGC, FreePixmap, GetInputFocus, + GetProperty, ListExtensions, PutImage, QueryExtension, RenderCreateCursor, + RenderCreatePicture, RenderQueryPictFormats, Setup, }, xcon::{ consts::{IMAGE_FORMAT_Z_PIXMAP, RENDER_PICT_TYPE_DIRECT}, incoming::handle_incoming, outgoing::handle_outgoing, wire_type::SendEvent, - xauthority::{XAuthority, LOCAL, MIT_MAGIC_COOKIE}, + xauthority::{LOCAL, MIT_MAGIC_COOKIE, XAuthority}, }, }, ahash::AHashMap, @@ -50,7 +50,7 @@ use { task::{Context, Poll, Waker}, }, thiserror::Error, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; pub mod consts; diff --git a/src/xcon/incoming.rs b/src/xcon/incoming.rs index 747cd881..c79a63dd 100644 --- a/src/xcon/incoming.rs +++ b/src/xcon/incoming.rs @@ -2,7 +2,7 @@ use { crate::{ utils::{bufio::BufIoIncoming, errorfmt::ErrorFmt}, xcon::{ - consts::XGE_EVENT, Event, ExtensionData, ExtensionIdRange, Parser, XconData, XconError, + Event, ExtensionData, ExtensionIdRange, Parser, XconData, XconError, consts::XGE_EVENT, }, }, std::{mem, rc::Rc}, diff --git a/src/xcon/parser.rs b/src/xcon/parser.rs index d3845dac..a8d103f0 100644 --- a/src/xcon/parser.rs +++ b/src/xcon/parser.rs @@ -1,7 +1,7 @@ use { crate::{ utils::ptr_ext::PtrExt, - xcon::{wire_type::Message, XconError}, + xcon::{XconError, wire_type::Message}, }, bstr::{BStr, ByteSlice}, std::{borrow::Cow, rc::Rc}, diff --git a/src/xcon/wire_type.rs b/src/xcon/wire_type.rs index 8860a38d..a3dbbfa5 100644 --- a/src/xcon/wire_type.rs +++ b/src/xcon/wire_type.rs @@ -1,5 +1,5 @@ use { - crate::xcon::{formatter::Formatter, parser::Parser, XconError}, + crate::xcon::{XconError, formatter::Formatter, parser::Parser}, bstr::{BStr, ByteSlice}, std::{borrow::Cow, fmt::Debug, rc::Rc}, uapi::OwnedFd, diff --git a/src/xwayland.rs b/src/xwayland.rs index 2d64fa8a..949b5f08 100644 --- a/src/xwayland.rs +++ b/src/xwayland.rs @@ -7,7 +7,7 @@ use { compositor::DISPLAY, forker::{ForkerError, ForkerProxy}, ifs::{ - ipc::{x_data_offer::XDataOffer, DataOfferId, DataSourceId, IpcLocation}, + ipc::{DataOfferId, DataSourceId, IpcLocation, x_data_offer::XDataOffer}, wl_seat::SeatId, wl_surface::x_surface::xwindow::{Xwindow, XwindowData}, }, @@ -25,7 +25,7 @@ use { bstr::ByteSlice, std::{num::ParseIntError, rc::Rc}, thiserror::Error, - uapi::{c, pipe2, OwnedFd}, + uapi::{OwnedFd, c, pipe2}, }; #[derive(Debug, Error)] diff --git a/src/xwayland/xsocket.rs b/src/xwayland/xsocket.rs index 19f40f70..a0bb498f 100644 --- a/src/xwayland/xsocket.rs +++ b/src/xwayland/xsocket.rs @@ -4,7 +4,7 @@ use { io::{Read, Write}, rc::Rc, }, - uapi::{c, format_ustr, Errno, OwnedFd, Ustring}, + uapi::{Errno, OwnedFd, Ustring, c, format_ustr}, }; const SOCK_DIR: &str = "/tmp/.X11-unix"; diff --git a/src/xwayland/xwm.rs b/src/xwayland/xwm.rs index 881b47aa..1d5f0b33 100644 --- a/src/xwayland/xwm.rs +++ b/src/xwayland/xwm.rs @@ -6,18 +6,17 @@ use { client::Client, ifs::{ ipc::{ - add_data_source_mime_type, destroy_data_device, destroy_data_offer, + DataOfferId, DataSourceId, DynDataOffer, DynDataSource, IpcLocation, IpcVtable, + SourceData, add_data_source_mime_type, destroy_data_device, destroy_data_offer, destroy_data_source, receive_data_offer, x_data_device::{XClipboardIpc, XIpc, XIpcDevice, XPrimarySelectionIpc}, x_data_offer::XDataOffer, x_data_source::XDataSource, - DataOfferId, DataSourceId, DynDataOffer, DynDataSource, IpcLocation, IpcVtable, - SourceData, }, wl_seat::{SeatId, WlSeatGlobal}, wl_surface::{ - x_surface::xwindow::{XInputModel, Xwindow, XwindowData}, WlSurface, + x_surface::xwindow::{XInputModel, Xwindow, XwindowData}, }, }, io_uring::{IoUring, IoUringError}, @@ -40,8 +39,10 @@ use { SetSelectionOwner, UnmapNotify, XfixesQueryVersion, XfixesSelectionNotify, }, xcon::{ + Event, XEvent, Xcon, XconError, consts::{ - ATOM_ATOM, ATOM_NONE, ATOM_STRING, ATOM_WINDOW, ATOM_WM_CLASS, ATOM_WM_NAME, + _NET_WM_STATE_ADD, _NET_WM_STATE_REMOVE, _NET_WM_STATE_TOGGLE, ATOM_ATOM, + ATOM_NONE, ATOM_STRING, ATOM_WINDOW, ATOM_WM_CLASS, ATOM_WM_NAME, ATOM_WM_SIZE_HINTS, ATOM_WM_TRANSIENT_FOR, COMPOSITE_REDIRECT_MANUAL, CONFIG_WINDOW_HEIGHT, CONFIG_WINDOW_WIDTH, CONFIG_WINDOW_X, CONFIG_WINDOW_Y, EVENT_MASK_FOCUS_CHANGE, EVENT_MASK_PROPERTY_CHANGE, @@ -52,16 +53,14 @@ use { PROP_MODE_APPEND, PROP_MODE_REPLACE, RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID, SELECTION_CLIENT_CLOSE_MASK, SELECTION_WINDOW_DESTROY_MASK, SET_SELECTION_OWNER_MASK, STACK_MODE_ABOVE, STACK_MODE_BELOW, - WINDOW_CLASS_INPUT_OUTPUT, _NET_WM_STATE_ADD, _NET_WM_STATE_REMOVE, - _NET_WM_STATE_TOGGLE, + WINDOW_CLASS_INPUT_OUTPUT, }, - Event, XEvent, Xcon, XconError, }, xwayland::{XWaylandError, XWaylandEvent}, }, ahash::{AHashMap, AHashSet}, bstr::ByteSlice, - futures_util::{select, FutureExt}, + futures_util::{FutureExt, select}, smallvec::SmallVec, std::{ borrow::Cow, @@ -72,7 +71,7 @@ use { rc::Rc, time::Duration, }, - uapi::{c, OwnedFd}, + uapi::{OwnedFd, c}, }; atoms! { @@ -426,7 +425,7 @@ impl Wm { Some(f) => f, _ => break 'set_root_cursor, }; - let first = match first.iter().find(|i| i.0 .0 == 1) { + let first = match first.iter().find(|i| i.0.0 == 1) { Some(f) => f.1, _ => break 'set_root_cursor, }; diff --git a/toml-config/Cargo.toml b/toml-config/Cargo.toml index 3b65d3f5..4741ee31 100644 --- a/toml-config/Cargo.toml +++ b/toml-config/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jay-toml-config" version = "0.9.0" -edition = "2021" +edition = "2024" license = "GPL-3.0-only" description = "Internal dependency of the Jay compositor" repository = "https://github.com/mahkoh/jay" diff --git a/toml-config/src/config.rs b/toml-config/src/config.rs index 15a700ec..43730a22 100644 --- a/toml-config/src/config.rs +++ b/toml-config/src/config.rs @@ -17,14 +17,14 @@ use { }, ahash::AHashMap, jay_config::{ - input::{acceleration::AccelProfile, SwitchEvent}, - keyboard::{mods::Modifiers, Keymap, ModifiedKeySym}, + Axis, Direction, Workspace, + input::{SwitchEvent, acceleration::AccelProfile}, + keyboard::{Keymap, ModifiedKeySym, mods::Modifiers}, logging::LogLevel, status::MessageFormat, theme::Color, video::{Format, GfxApi, TearingMode, Transform, VrrMode}, xwayland::XScalingMode, - Axis, Direction, Workspace, }, std::{ error::Error, diff --git a/toml-config/src/config/parsers/action.rs b/toml-config/src/config/parsers/action.rs index c1b610cd..4fbddb36 100644 --- a/toml-config/src/config/parsers/action.rs +++ b/toml-config/src/config/parsers/action.rs @@ -1,10 +1,12 @@ use { crate::{ config::{ + Action, context::Context, - extractor::{arr, bol, n32, opt, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, arr, bol, n32, opt, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ + StringParser, StringParserError, connector::{ConnectorParser, ConnectorParserError}, drm_device::{DrmDeviceParser, DrmDeviceParserError}, drm_device_match::{DrmDeviceMatchParser, DrmDeviceMatchParserError}, @@ -20,10 +22,8 @@ use { repeat_rate::{RepeatRateParser, RepeatRateParserError}, status::{StatusParser, StatusParserError}, theme::{ThemeParser, ThemeParserError}, - StringParser, StringParserError, }, spanned::SpannedErrorExt, - Action, }, toml::{ toml_span::{DespanExt, Span, Spanned, SpannedExt}, @@ -32,8 +32,8 @@ use { }, indexmap::IndexMap, jay_config::{ - get_workspace, Axis::{Horizontal, Vertical}, + get_workspace, }, thiserror::Error, }; @@ -114,7 +114,9 @@ impl ActionParser<'_> { "enable-window-management" => EnableWindowManagement(true), "disable-window-management" => EnableWindowManagement(false), _ => { - return Err(ActionParserError::UnknownSimpleAction(string.to_string()).spanned(span)) + return Err( + ActionParserError::UnknownSimpleAction(string.to_string()).spanned(span) + ); } }; Ok(Action::SimpleCommand { cmd }) diff --git a/toml-config/src/config/parsers/config.rs b/toml-config/src/config/parsers/config.rs index 58a22490..4ca65a88 100644 --- a/toml-config/src/config/parsers/config.rs +++ b/toml-config/src/config/parsers/config.rs @@ -1,8 +1,9 @@ use { crate::{ config::{ + Action, Config, Libei, Theme, UiDrag, context::Context, - extractor::{arr, bol, opt, recover, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, arr, bol, opt, recover, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ action::ActionParser, @@ -19,8 +20,8 @@ use { output::OutputsParser, repeat_rate::RepeatRateParser, shortcuts::{ - parse_modified_keysym_str, ComplexShortcutsParser, ShortcutsParser, - ShortcutsParserError, + ComplexShortcutsParser, ShortcutsParser, ShortcutsParserError, + parse_modified_keysym_str, }, status::StatusParser, tearing::TearingParser, @@ -30,7 +31,6 @@ use { xwayland::XwaylandParser, }, spanned::SpannedErrorExt, - Action, Config, Libei, Theme, UiDrag, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/connector.rs b/toml-config/src/config/parsers/connector.rs index b603b409..c1618221 100644 --- a/toml-config/src/config/parsers/connector.rs +++ b/toml-config/src/config/parsers/connector.rs @@ -1,11 +1,11 @@ use { crate::{ config::{ + ConfigConnector, context::Context, - extractor::{bol, opt, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, bol, opt, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::connector_match::{ConnectorMatchParser, ConnectorMatchParserError}, - ConfigConnector, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/connector_match.rs b/toml-config/src/config/parsers/connector_match.rs index 3e7853a3..b9eb4e9b 100644 --- a/toml-config/src/config/parsers/connector_match.rs +++ b/toml-config/src/config/parsers/connector_match.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, str, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, ConnectorMatch, + context::Context, + extractor::{Extractor, ExtractorError, opt, str}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned}, diff --git a/toml-config/src/config/parsers/drm_device.rs b/toml-config/src/config/parsers/drm_device.rs index 4b488dbe..d2030adf 100644 --- a/toml-config/src/config/parsers/drm_device.rs +++ b/toml-config/src/config/parsers/drm_device.rs @@ -1,14 +1,14 @@ use { crate::{ config::{ + ConfigDrmDevice, context::Context, - extractor::{bol, fltorint, opt, recover, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, bol, fltorint, opt, recover, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ drm_device_match::{DrmDeviceMatchParser, DrmDeviceMatchParserError}, gfx_api::GfxApiParser, }, - ConfigDrmDevice, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/drm_device_match.rs b/toml-config/src/config/parsers/drm_device_match.rs index ec7fe558..3b0aeac7 100644 --- a/toml-config/src/config/parsers/drm_device_match.rs +++ b/toml-config/src/config/parsers/drm_device_match.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{n32, opt, recover, str, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, DrmDeviceMatch, + context::Context, + extractor::{Extractor, ExtractorError, n32, opt, recover, str}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/exec.rs b/toml-config/src/config/parsers/exec.rs index d247fd1d..1d6829e5 100644 --- a/toml-config/src/config/parsers/exec.rs +++ b/toml-config/src/config/parsers/exec.rs @@ -1,14 +1,14 @@ use { crate::{ config::{ + Exec, context::Context, - extractor::{arr, bol, opt, recover, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, arr, bol, opt, recover, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ - env::{EnvParser, EnvParserError}, StringParser, StringParserError, + env::{EnvParser, EnvParserError}, }, - Exec, }, toml::{ toml_span::{DespanExt, Span, Spanned, SpannedExt}, diff --git a/toml-config/src/config/parsers/idle.rs b/toml-config/src/config/parsers/idle.rs index 2da7bbe3..57d03b36 100644 --- a/toml-config/src/config/parsers/idle.rs +++ b/toml-config/src/config/parsers/idle.rs @@ -2,7 +2,7 @@ use { crate::{ config::{ context::Context, - extractor::{n64, opt, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, n64, opt, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ diff --git a/toml-config/src/config/parsers/input.rs b/toml-config/src/config/parsers/input.rs index 1660e933..c0949228 100644 --- a/toml-config/src/config/parsers/input.rs +++ b/toml-config/src/config/parsers/input.rs @@ -1,8 +1,9 @@ use { crate::{ config::{ + Input, context::Context, - extractor::{bol, fltorint, opt, recover, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, bol, fltorint, opt, recover, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ action::ActionParser, @@ -10,7 +11,6 @@ use { keymap::KeymapParser, output_match::OutputMatchParser, }, - Input, }, toml::{ toml_span::{DespanExt, Span, Spanned, SpannedExt}, @@ -20,8 +20,8 @@ use { ahash::AHashMap, indexmap::IndexMap, jay_config::input::{ - acceleration::{ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT}, SwitchEvent, + acceleration::{ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT}, }, thiserror::Error, }; diff --git a/toml-config/src/config/parsers/input_match.rs b/toml-config/src/config/parsers/input_match.rs index 77953110..0d534cea 100644 --- a/toml-config/src/config/parsers/input_match.rs +++ b/toml-config/src/config/parsers/input_match.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{bol, opt, str, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, InputMatch, + context::Context, + extractor::{Extractor, ExtractorError, bol, opt, str}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/keymap.rs b/toml-config/src/config/parsers/keymap.rs index 2ab00208..b803fd91 100644 --- a/toml-config/src/config/parsers/keymap.rs +++ b/toml-config/src/config/parsers/keymap.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, str, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, ConfigKeymap, + context::Context, + extractor::{Extractor, ExtractorError, opt, str}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, @@ -14,7 +14,7 @@ use { indexmap::IndexMap, jay_config::{ config_dir, - keyboard::{parse_keymap, Keymap}, + keyboard::{Keymap, parse_keymap}, }, std::{io, path::PathBuf}, thiserror::Error, @@ -73,7 +73,7 @@ impl Parser for KeymapParser<'_> { Ok(c) => c, Err(e) => { return Err(KeymapParserError::ReadFile(root.display().to_string(), e) - .spanned(path.span)) + .spanned(path.span)); } }; map_val = Some(file_content.as_str().spanned(path.span)); diff --git a/toml-config/src/config/parsers/libei.rs b/toml-config/src/config/parsers/libei.rs index 83e552fb..47fd825f 100644 --- a/toml-config/src/config/parsers/libei.rs +++ b/toml-config/src/config/parsers/libei.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{bol, opt, recover, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, Libei, + context::Context, + extractor::{Extractor, ExtractorError, bol, opt, recover}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/mode.rs b/toml-config/src/config/parsers/mode.rs index e84cb908..5a64d9ae 100644 --- a/toml-config/src/config/parsers/mode.rs +++ b/toml-config/src/config/parsers/mode.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{fltorint, opt, s32, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, Mode, + context::Context, + extractor::{Extractor, ExtractorError, fltorint, opt, s32}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/modified_keysym.rs b/toml-config/src/config/parsers/modified_keysym.rs index 4d191914..204724c9 100644 --- a/toml-config/src/config/parsers/modified_keysym.rs +++ b/toml-config/src/config/parsers/modified_keysym.rs @@ -7,11 +7,11 @@ use { toml::toml_span::{Span, SpannedExt}, }, jay_config::keyboard::{ + ModifiedKeySym, mods::{ - Modifiers, ALT, CAPS, CTRL, LOCK, LOGO, MOD1, MOD2, MOD3, MOD4, MOD5, NUM, RELEASE, + ALT, CAPS, CTRL, LOCK, LOGO, MOD1, MOD2, MOD3, MOD4, MOD5, Modifiers, NUM, RELEASE, SHIFT, }, - ModifiedKeySym, }, thiserror::Error, }; @@ -51,7 +51,7 @@ impl Parser for ModifiedKeysymParser { Some(_) => return Err(ModifiedKeysymParserError::MoreThanOneSym.spanned(span)), _ => { return Err(ModifiedKeysymParserError::UnknownKeysym(part.to_string()) - .spanned(span)) + .spanned(span)); } }, }; diff --git a/toml-config/src/config/parsers/output.rs b/toml-config/src/config/parsers/output.rs index 83f15b12..2f2940ba 100644 --- a/toml-config/src/config/parsers/output.rs +++ b/toml-config/src/config/parsers/output.rs @@ -1,8 +1,9 @@ use { crate::{ config::{ + Output, context::Context, - extractor::{fltorint, opt, recover, s32, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, fltorint, opt, recover, s32, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ format::FormatParser, @@ -11,7 +12,6 @@ use { tearing::TearingParser, vrr::VrrParser, }, - Output, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/output_match.rs b/toml-config/src/config/parsers/output_match.rs index dedaad74..f771135a 100644 --- a/toml-config/src/config/parsers/output_match.rs +++ b/toml-config/src/config/parsers/output_match.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, str, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, OutputMatch, + context::Context, + extractor::{Extractor, ExtractorError, opt, str}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/repeat_rate.rs b/toml-config/src/config/parsers/repeat_rate.rs index af16ca7b..4374d853 100644 --- a/toml-config/src/config/parsers/repeat_rate.rs +++ b/toml-config/src/config/parsers/repeat_rate.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{s32, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, RepeatRate, + context::Context, + extractor::{Extractor, ExtractorError, s32}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned}, diff --git a/toml-config/src/config/parsers/shortcuts.rs b/toml-config/src/config/parsers/shortcuts.rs index 09e2dfb2..46e71813 100644 --- a/toml-config/src/config/parsers/shortcuts.rs +++ b/toml-config/src/config/parsers/shortcuts.rs @@ -1,8 +1,9 @@ use { crate::{ config::{ + Action, Shortcut, SimpleCommand, context::Context, - extractor::{opt, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, opt, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::{ action::{ActionParser, ActionParserError}, @@ -11,7 +12,6 @@ use { }, }, spanned::SpannedErrorExt, - Action, Shortcut, SimpleCommand, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, @@ -19,7 +19,7 @@ use { }, }, indexmap::IndexMap, - jay_config::keyboard::{mods::Modifiers, ModifiedKeySym}, + jay_config::keyboard::{ModifiedKeySym, mods::Modifiers}, std::collections::HashSet, thiserror::Error, }; diff --git a/toml-config/src/config/parsers/status.rs b/toml-config/src/config/parsers/status.rs index 68809cc2..77e3aa72 100644 --- a/toml-config/src/config/parsers/status.rs +++ b/toml-config/src/config/parsers/status.rs @@ -1,11 +1,11 @@ use { crate::{ config::{ + Status, context::Context, - extractor::{opt, recover, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, opt, recover, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::exec::{ExecParser, ExecParserError}, - Status, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, @@ -55,7 +55,7 @@ impl Parser for StatusParser<'_> { _ => { return Err( StatusParserError::UnknownFormat(f.value.to_string()).spanned(f.span) - ) + ); } }, _ => MessageFormat::Plain, diff --git a/toml-config/src/config/parsers/tearing.rs b/toml-config/src/config/parsers/tearing.rs index ec991681..7e6061bc 100644 --- a/toml-config/src/config/parsers/tearing.rs +++ b/toml-config/src/config/parsers/tearing.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, val, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, Tearing, + context::Context, + extractor::{Extractor, ExtractorError, opt, val}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, diff --git a/toml-config/src/config/parsers/theme.rs b/toml-config/src/config/parsers/theme.rs index 33b91742..bc971520 100644 --- a/toml-config/src/config/parsers/theme.rs +++ b/toml-config/src/config/parsers/theme.rs @@ -1,11 +1,11 @@ use { crate::{ config::{ + Theme, context::Context, - extractor::{opt, recover, s32, str, val, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, opt, recover, s32, str, val}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::color::ColorParser, - Theme, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/ui_drag.rs b/toml-config/src/config/parsers/ui_drag.rs index e164aa86..aff14805 100644 --- a/toml-config/src/config/parsers/ui_drag.rs +++ b/toml-config/src/config/parsers/ui_drag.rs @@ -1,11 +1,11 @@ use { crate::{ config::{ + UiDrag, context::Context, - extractor::{bol, int, opt, recover, Extractor, ExtractorError}, + extractor::{Extractor, ExtractorError, bol, int, opt, recover}, parser::{DataType, ParseResult, Parser, UnexpectedDataType}, parsers::exec::ExecParserError, - UiDrag, }, toml::{ toml_span::{DespanExt, Span, Spanned}, diff --git a/toml-config/src/config/parsers/vrr.rs b/toml-config/src/config/parsers/vrr.rs index 144bd059..f2f2322a 100644 --- a/toml-config/src/config/parsers/vrr.rs +++ b/toml-config/src/config/parsers/vrr.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, val, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, Vrr, + context::Context, + extractor::{Extractor, ExtractorError, opt, val}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, diff --git a/toml-config/src/config/parsers/xwayland.rs b/toml-config/src/config/parsers/xwayland.rs index 899e01d3..6fc9b9f0 100644 --- a/toml-config/src/config/parsers/xwayland.rs +++ b/toml-config/src/config/parsers/xwayland.rs @@ -1,10 +1,10 @@ use { crate::{ config::{ - context::Context, - extractor::{opt, val, Extractor, ExtractorError}, - parser::{DataType, ParseResult, Parser, UnexpectedDataType}, Xwayland, + context::Context, + extractor::{Extractor, ExtractorError, opt, val}, + parser::{DataType, ParseResult, Parser, UnexpectedDataType}, }, toml::{ toml_span::{Span, Spanned, SpannedExt}, diff --git a/toml-config/src/lib.rs b/toml-config/src/lib.rs index e856fd45..7fa7cb2d 100644 --- a/toml-config/src/lib.rs +++ b/toml-config/src/lib.rs @@ -5,20 +5,20 @@ mod toml; use { crate::config::{ - parse_config, Action, Config, ConfigConnector, ConfigDrmDevice, ConfigKeymap, - ConnectorMatch, DrmDeviceMatch, Exec, Input, InputMatch, Output, OutputMatch, Shortcut, - SimpleCommand, Status, Theme, + Action, Config, ConfigConnector, ConfigDrmDevice, ConfigKeymap, ConnectorMatch, + DrmDeviceMatch, Exec, Input, InputMatch, Output, OutputMatch, Shortcut, SimpleCommand, + Status, Theme, parse_config, }, ahash::{AHashMap, AHashSet}, error_reporter::Report, jay_config::{ config, config_dir, - exec::{set_env, unset_env, Command}, + exec::{Command, set_env, unset_env}, get_workspace, input::{ - capability::CAP_SWITCH, get_seat, input_devices, on_input_device_removed, - on_new_input_device, set_libei_socket_enabled, FocusFollowsMouseMode, InputDevice, - Seat, SwitchEvent, + FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, capability::CAP_SWITCH, + get_seat, input_devices, on_input_device_removed, on_new_input_device, + set_libei_socket_enabled, }, is_reload, keyboard::{Keymap, ModifiedKeySym}, @@ -30,10 +30,10 @@ use { switch_to_vt, theme::{reset_colors, reset_font, reset_sizes, set_font}, video::{ - connectors, drm_devices, on_connector_connected, on_connector_disconnected, - on_graphics_initialized, on_new_connector, on_new_drm_device, - set_direct_scanout_enabled, set_gfx_api, set_tearing_mode, set_vrr_cursor_hz, - set_vrr_mode, Connector, DrmDevice, + Connector, DrmDevice, connectors, drm_devices, on_connector_connected, + on_connector_disconnected, on_graphics_initialized, on_new_connector, + on_new_drm_device, set_direct_scanout_enabled, set_gfx_api, set_tearing_mode, + set_vrr_cursor_hz, set_vrr_mode, }, xwayland::set_x_scaling_mode, }, diff --git a/toml-config/src/toml/tests.rs b/toml-config/src/toml/tests.rs index 0645508a..0cb76e36 100644 --- a/toml-config/src/toml/tests.rs +++ b/toml-config/src/toml/tests.rs @@ -2,7 +2,7 @@ use { crate::{ config::error::SpannedError, toml::{ - toml_parser::{parse, ErrorHandler, ParserError}, + toml_parser::{ErrorHandler, ParserError, parse}, toml_span::{Span, Spanned, SpannedExt}, toml_value::Value, }, @@ -11,7 +11,7 @@ use { std::{ convert::Infallible, os::unix::ffi::OsStrExt, - panic::{catch_unwind, AssertUnwindSafe}, + panic::{AssertUnwindSafe, catch_unwind}, str::FromStr, }, walkdir::WalkDir, diff --git a/toml-config/src/toml/toml_parser.rs b/toml-config/src/toml/toml_parser.rs index de10b811..cd5d387b 100644 --- a/toml-config/src/toml/toml_parser.rs +++ b/toml-config/src/toml/toml_parser.rs @@ -6,8 +6,8 @@ use { }, bstr::ByteSlice, indexmap::{ - map::{raw_entry_v1::RawEntryMut, RawEntryApiV1}, IndexMap, + map::{RawEntryApiV1, raw_entry_v1::RawEntryMut}, }, std::{collections::VecDeque, mem, str::FromStr}, thiserror::Error, diff --git a/toml-spec/Cargo.toml b/toml-spec/Cargo.toml index 09e0a7aa..ec3a8426 100644 --- a/toml-spec/Cargo.toml +++ b/toml-spec/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "toml-spec" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] serde = { version = "1.0.197", features = ["derive"] } diff --git a/toml-spec/src/json_schema.rs b/toml-spec/src/json_schema.rs index 68f4a61d..1efc95f8 100644 --- a/toml-spec/src/json_schema.rs +++ b/toml-spec/src/json_schema.rs @@ -4,7 +4,7 @@ use { StringSpec, TableSpec, TopLevelTypeSpec, VariantSpec, }, anyhow::Result, - serde_json::{json, Map, Value}, + serde_json::{Map, Value, json}, }; pub fn generate_json_schema( diff --git a/toml-spec/src/markdown.rs b/toml-spec/src/markdown.rs index 75e6055b..5ae8b31d 100644 --- a/toml-spec/src/markdown.rs +++ b/toml-spec/src/markdown.rs @@ -106,7 +106,10 @@ fn write_variant_spec(buf: &mut Vec, spec: &VariantSpec) -> Result<()> { let ts = spec!(ts); match ts { TableSpec::Tagged { types } => { - writeln!(buf, "This table is a tagged union. The variant is determined by the `type` field. It takes one of the following values:")?; + writeln!( + buf, + "This table is a tagged union. The variant is determined by the `type` field. It takes one of the following values:" + )?; writeln!(buf)?; for (name, spec) in types { writeln!(buf, "- `{name}`:")?; diff --git a/toml-spec/src/types.rs b/toml-spec/src/types.rs index b5dabf41..40b9d1b9 100644 --- a/toml-spec/src/types.rs +++ b/toml-spec/src/types.rs @@ -2,8 +2,8 @@ use { error_reporter::Report, indexmap::IndexMap, serde::{ - de::{DeserializeOwned, Error}, Deserialize, Deserializer, + de::{DeserializeOwned, Error}, }, }; @@ -119,7 +119,7 @@ impl<'de> Deserialize<'de> for TopLevelTypeSpec { "spec must define either variants or a single variant. failures: {} ----- {}", Report::new(e1), Report::new(e2) - ))) + ))); } }; Ok(res) @@ -148,7 +148,7 @@ impl<'de> Deserialize<'de> for TableSpec { "spec must define either types or fields. failures: {} ----- {}", Report::new(e1), Report::new(e2) - ))) + ))); } }; Ok(res) @@ -176,7 +176,7 @@ impl<'de, U: DeserializeOwned> Deserialize<'de> for RefOrSpec { "spec must define either a ref or a spec. failures: {} ----- {}", Report::new(e1), Report::new(e2) - ))) + ))); } }; Ok(res)