From 1a1ea098c180f9673d21894cd10eae525f93f5e2 Mon Sep 17 00:00:00 2001 From: Robin Quint Date: Thu, 22 Dec 2022 15:10:09 +0100 Subject: [PATCH] cargo fmt --- imgui/src/input/keyboard.rs | 8 +- imgui/src/input/mouse.rs | 6 +- imgui/src/io.rs | 213 ++++++++++++++++++------------------ 3 files changed, 116 insertions(+), 111 deletions(-) diff --git a/imgui/src/input/keyboard.rs b/imgui/src/input/keyboard.rs index 6f42189..91f20bd 100644 --- a/imgui/src/input/keyboard.rs +++ b/imgui/src/input/keyboard.rs @@ -345,7 +345,7 @@ impl Ui { #[inline] #[doc(alias = "IsKeyDown")] pub fn is_key_index_down(&self, key_index: u32) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsKeyDown_Nil(key_index) } } else { @@ -371,7 +371,7 @@ impl Ui { #[inline] #[doc(alias = "IsKeyPressed")] pub fn is_key_index_pressed(&self, key_index: u32) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsKeyPressed_Bool(key_index, true) } } else { @@ -398,7 +398,7 @@ impl Ui { #[inline] #[doc(alias = "IsKeyPressed")] pub fn is_key_index_pressed_no_repeat(&self, key_index: u32) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsKeyPressed_Bool(key_index, false) } } else { @@ -422,7 +422,7 @@ impl Ui { #[inline] #[doc(alias = "IsKeyReleased")] pub fn is_key_index_released(&self, key_index: u32) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsKeyReleased_Nil(key_index) } } else { diff --git a/imgui/src/input/mouse.rs b/imgui/src/input/mouse.rs index 084941b..2656b1e 100644 --- a/imgui/src/input/mouse.rs +++ b/imgui/src/input/mouse.rs @@ -95,7 +95,7 @@ impl Ui { /// Equivalent to indexing the Io struct with the button, e.g. `ui.io()[button]`. #[doc(alias = "IsMouseDown")] pub fn is_mouse_down(&self, button: MouseButton) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsMouseDown_Nil(button as i32) } } else { @@ -111,7 +111,7 @@ impl Ui { /// Returns true if the given mouse button was clicked (went from !down to down) #[doc(alias = "IsMouseClicked")] pub fn is_mouse_clicked(&self, button: MouseButton) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsMouseClicked_Bool(button as i32, false) } } else { @@ -127,7 +127,7 @@ impl Ui { /// Returns true if the given mouse button was released (went from down to !down) #[doc(alias = "IsMouseReleased")] pub fn is_mouse_released(&self, button: MouseButton) -> bool { - cfg_if::cfg_if!{ + cfg_if::cfg_if! { if #[cfg(feature = "docking")] { unsafe { sys::igIsMouseReleased_Nil(button as i32) } } else { diff --git a/imgui/src/io.rs b/imgui/src/io.rs index af3575e..27e109e 100644 --- a/imgui/src/io.rs +++ b/imgui/src/io.rs @@ -481,108 +481,113 @@ fn test_io_memory_layout() { }; } - std::thread::Builder::new().stack_size(4 * 1024 * 1024).spawn(|| { - assert_field_offset!(config_flags, ConfigFlags); - assert_field_offset!(backend_flags, BackendFlags); - assert_field_offset!(display_size, DisplaySize); - assert_field_offset!(delta_time, DeltaTime); - assert_field_offset!(ini_saving_rate, IniSavingRate); - assert_field_offset!(ini_filename, IniFilename); - assert_field_offset!(log_filename, LogFilename); - assert_field_offset!(mouse_double_click_time, MouseDoubleClickTime); - assert_field_offset!(mouse_double_click_max_dist, MouseDoubleClickMaxDist); - assert_field_offset!(mouse_drag_threshold, MouseDragThreshold); - assert_field_offset!(key_repeat_delay, KeyRepeatDelay); - assert_field_offset!(key_repeat_rate, KeyRepeatRate); - assert_field_offset!(hover_delay_normal, HoverDelayNormal); - assert_field_offset!(hover_delay_short, HoverDelayShort); - assert_field_offset!(user_data, UserData); - assert_field_offset!(fonts, Fonts); - assert_field_offset!(font_global_scale, FontGlobalScale); - assert_field_offset!(font_allow_user_scaling, FontAllowUserScaling); - assert_field_offset!(font_default, FontDefault); - assert_field_offset!(display_framebuffer_scale, DisplayFramebufferScale); - assert_field_offset!(mouse_draw_cursor, MouseDrawCursor); - assert_field_offset!(config_mac_os_behaviors, ConfigMacOSXBehaviors); - assert_field_offset!( - config_input_trickle_event_queue, - ConfigInputTrickleEventQueue - ); - assert_field_offset!(config_input_text_cursor_blink, ConfigInputTextCursorBlink); - assert_field_offset!( - config_input_text_enter_keep_active, - ConfigInputTextEnterKeepActive - ); - assert_field_offset!( - config_windows_resize_from_edges, - ConfigWindowsResizeFromEdges - ); - assert_field_offset!( - config_windows_move_from_title_bar_only, - ConfigWindowsMoveFromTitleBarOnly - ); - assert_field_offset!(backend_platform_name, BackendPlatformName); - assert_field_offset!(backend_renderer_name, BackendRendererName); - assert_field_offset!(backend_platform_user_data, BackendPlatformUserData); - assert_field_offset!(backend_renderer_user_data, BackendRendererUserData); - assert_field_offset!(backend_language_user_data, BackendLanguageUserData); - assert_field_offset!(get_clipboard_text_fn, GetClipboardTextFn); - assert_field_offset!(set_clipboard_text_fn, SetClipboardTextFn); - assert_field_offset!(clipboard_user_data, ClipboardUserData); - assert_field_offset!(set_platform_ime_data_fn, SetPlatformImeDataFn); - assert_field_offset!(unused_padding, _UnusedPadding); - assert_field_offset!(want_capture_mouse, WantCaptureMouse); - assert_field_offset!(want_capture_keyboard, WantCaptureKeyboard); - assert_field_offset!(want_text_input, WantTextInput); - assert_field_offset!(want_set_mouse_pos, WantSetMousePos); - assert_field_offset!(want_save_ini_settings, WantSaveIniSettings); - assert_field_offset!(nav_active, NavActive); - assert_field_offset!(nav_visible, NavVisible); - assert_field_offset!(framerate, Framerate); - assert_field_offset!(metrics_render_vertices, MetricsRenderVertices); - assert_field_offset!(metrics_render_indices, MetricsRenderIndices); - assert_field_offset!(metrics_render_windows, MetricsRenderWindows); - assert_field_offset!(metrics_active_windows, MetricsActiveWindows); - assert_field_offset!(metrics_active_allocations, MetricsActiveAllocations); - assert_field_offset!(mouse_delta, MouseDelta); - assert_field_offset!(key_map, KeyMap); - assert_field_offset!(keys_down, KeysDown); - assert_field_offset!(nav_inputs, NavInputs); - assert_field_offset!(mouse_pos, MousePos); - assert_field_offset!(mouse_down, MouseDown); - assert_field_offset!(mouse_wheel, MouseWheel); - assert_field_offset!(mouse_wheel_h, MouseWheelH); - assert_field_offset!(key_ctrl, KeyCtrl); - assert_field_offset!(key_shift, KeyShift); - assert_field_offset!(key_alt, KeyAlt); - assert_field_offset!(key_super, KeySuper); - assert_field_offset!(key_mods, KeyMods); - assert_field_offset!(keys_data, KeysData); - assert_field_offset!( - want_capture_mouse_unless_popup_close, - WantCaptureMouseUnlessPopupClose - ); - assert_field_offset!(mouse_pos_prev, MousePosPrev); - assert_field_offset!(mouse_clicked_pos, MouseClickedPos); - assert_field_offset!(mouse_clicked_time, MouseClickedTime); - assert_field_offset!(mouse_clicked, MouseClicked); - assert_field_offset!(mouse_double_clicked, MouseDoubleClicked); - assert_field_offset!(mouse_clicked_count, MouseClickedCount); - assert_field_offset!(mouse_clicked_last_count, MouseClickedLastCount); - assert_field_offset!(mouse_released, MouseReleased); - assert_field_offset!(mouse_down_owned, MouseDownOwned); - assert_field_offset!(mouse_down_duration, MouseDownDuration); - assert_field_offset!(mouse_down_duration_prev, MouseDownDurationPrev); - assert_field_offset!(mouse_drag_max_distance_sqr, MouseDragMaxDistanceSqr); - assert_field_offset!(pen_pressure, PenPressure); - assert_field_offset!(app_focus_lost, AppFocusLost); - assert_field_offset!(app_accepting_events, AppAcceptingEvents); - assert_field_offset!(backend_using_legacy_key_arrays, BackendUsingLegacyKeyArrays); - assert_field_offset!( - backend_using_legacy_nav_input_array, - BackendUsingLegacyNavInputArray - ); - assert_field_offset!(input_queue_surrogate, InputQueueSurrogate); - assert_field_offset!(input_queue_characters, InputQueueCharacters); - }).unwrap().join().unwrap(); + std::thread::Builder::new() + .stack_size(4 * 1024 * 1024) + .spawn(|| { + assert_field_offset!(config_flags, ConfigFlags); + assert_field_offset!(backend_flags, BackendFlags); + assert_field_offset!(display_size, DisplaySize); + assert_field_offset!(delta_time, DeltaTime); + assert_field_offset!(ini_saving_rate, IniSavingRate); + assert_field_offset!(ini_filename, IniFilename); + assert_field_offset!(log_filename, LogFilename); + assert_field_offset!(mouse_double_click_time, MouseDoubleClickTime); + assert_field_offset!(mouse_double_click_max_dist, MouseDoubleClickMaxDist); + assert_field_offset!(mouse_drag_threshold, MouseDragThreshold); + assert_field_offset!(key_repeat_delay, KeyRepeatDelay); + assert_field_offset!(key_repeat_rate, KeyRepeatRate); + assert_field_offset!(hover_delay_normal, HoverDelayNormal); + assert_field_offset!(hover_delay_short, HoverDelayShort); + assert_field_offset!(user_data, UserData); + assert_field_offset!(fonts, Fonts); + assert_field_offset!(font_global_scale, FontGlobalScale); + assert_field_offset!(font_allow_user_scaling, FontAllowUserScaling); + assert_field_offset!(font_default, FontDefault); + assert_field_offset!(display_framebuffer_scale, DisplayFramebufferScale); + assert_field_offset!(mouse_draw_cursor, MouseDrawCursor); + assert_field_offset!(config_mac_os_behaviors, ConfigMacOSXBehaviors); + assert_field_offset!( + config_input_trickle_event_queue, + ConfigInputTrickleEventQueue + ); + assert_field_offset!(config_input_text_cursor_blink, ConfigInputTextCursorBlink); + assert_field_offset!( + config_input_text_enter_keep_active, + ConfigInputTextEnterKeepActive + ); + assert_field_offset!( + config_windows_resize_from_edges, + ConfigWindowsResizeFromEdges + ); + assert_field_offset!( + config_windows_move_from_title_bar_only, + ConfigWindowsMoveFromTitleBarOnly + ); + assert_field_offset!(backend_platform_name, BackendPlatformName); + assert_field_offset!(backend_renderer_name, BackendRendererName); + assert_field_offset!(backend_platform_user_data, BackendPlatformUserData); + assert_field_offset!(backend_renderer_user_data, BackendRendererUserData); + assert_field_offset!(backend_language_user_data, BackendLanguageUserData); + assert_field_offset!(get_clipboard_text_fn, GetClipboardTextFn); + assert_field_offset!(set_clipboard_text_fn, SetClipboardTextFn); + assert_field_offset!(clipboard_user_data, ClipboardUserData); + assert_field_offset!(set_platform_ime_data_fn, SetPlatformImeDataFn); + assert_field_offset!(unused_padding, _UnusedPadding); + assert_field_offset!(want_capture_mouse, WantCaptureMouse); + assert_field_offset!(want_capture_keyboard, WantCaptureKeyboard); + assert_field_offset!(want_text_input, WantTextInput); + assert_field_offset!(want_set_mouse_pos, WantSetMousePos); + assert_field_offset!(want_save_ini_settings, WantSaveIniSettings); + assert_field_offset!(nav_active, NavActive); + assert_field_offset!(nav_visible, NavVisible); + assert_field_offset!(framerate, Framerate); + assert_field_offset!(metrics_render_vertices, MetricsRenderVertices); + assert_field_offset!(metrics_render_indices, MetricsRenderIndices); + assert_field_offset!(metrics_render_windows, MetricsRenderWindows); + assert_field_offset!(metrics_active_windows, MetricsActiveWindows); + assert_field_offset!(metrics_active_allocations, MetricsActiveAllocations); + assert_field_offset!(mouse_delta, MouseDelta); + assert_field_offset!(key_map, KeyMap); + assert_field_offset!(keys_down, KeysDown); + assert_field_offset!(nav_inputs, NavInputs); + assert_field_offset!(mouse_pos, MousePos); + assert_field_offset!(mouse_down, MouseDown); + assert_field_offset!(mouse_wheel, MouseWheel); + assert_field_offset!(mouse_wheel_h, MouseWheelH); + assert_field_offset!(key_ctrl, KeyCtrl); + assert_field_offset!(key_shift, KeyShift); + assert_field_offset!(key_alt, KeyAlt); + assert_field_offset!(key_super, KeySuper); + assert_field_offset!(key_mods, KeyMods); + assert_field_offset!(keys_data, KeysData); + assert_field_offset!( + want_capture_mouse_unless_popup_close, + WantCaptureMouseUnlessPopupClose + ); + assert_field_offset!(mouse_pos_prev, MousePosPrev); + assert_field_offset!(mouse_clicked_pos, MouseClickedPos); + assert_field_offset!(mouse_clicked_time, MouseClickedTime); + assert_field_offset!(mouse_clicked, MouseClicked); + assert_field_offset!(mouse_double_clicked, MouseDoubleClicked); + assert_field_offset!(mouse_clicked_count, MouseClickedCount); + assert_field_offset!(mouse_clicked_last_count, MouseClickedLastCount); + assert_field_offset!(mouse_released, MouseReleased); + assert_field_offset!(mouse_down_owned, MouseDownOwned); + assert_field_offset!(mouse_down_duration, MouseDownDuration); + assert_field_offset!(mouse_down_duration_prev, MouseDownDurationPrev); + assert_field_offset!(mouse_drag_max_distance_sqr, MouseDragMaxDistanceSqr); + assert_field_offset!(pen_pressure, PenPressure); + assert_field_offset!(app_focus_lost, AppFocusLost); + assert_field_offset!(app_accepting_events, AppAcceptingEvents); + assert_field_offset!(backend_using_legacy_key_arrays, BackendUsingLegacyKeyArrays); + assert_field_offset!( + backend_using_legacy_nav_input_array, + BackendUsingLegacyNavInputArray + ); + assert_field_offset!(input_queue_surrogate, InputQueueSurrogate); + assert_field_offset!(input_queue_characters, InputQueueCharacters); + }) + .unwrap() + .join() + .unwrap(); }