From 765baf6e48c67d6445f1cf3b4004f9217d9cd03a Mon Sep 17 00:00:00 2001 From: Reinis Mazeiks Date: Wed, 11 May 2022 13:47:58 +0300 Subject: [PATCH] Rename module `input` to avoid naming conflict with element of the same name Not sure if this was supposed to be allowed, but it was causing https://github.com/rust-lang/rust/issues/96934 --- examples/tui_keys.rs | 2 +- packages/html/src/events.rs | 2 +- packages/html/src/{input.rs => input_data.rs} | 0 packages/html/src/lib.rs | 2 +- packages/html/src/web_sys_bind/events.rs | 2 +- packages/tui/src/hooks.rs | 6 +++--- 6 files changed, 7 insertions(+), 7 deletions(-) rename packages/html/src/{input.rs => input_data.rs} (100%) diff --git a/examples/tui_keys.rs b/examples/tui_keys.rs index 11a96a9b2..138eec2fe 100644 --- a/examples/tui_keys.rs +++ b/examples/tui_keys.rs @@ -1,7 +1,7 @@ use dioxus::events::WheelEvent; use dioxus::prelude::*; use dioxus_html::geometry::ScreenPoint; -use dioxus_html::input::MouseButtonSet; +use dioxus_html::input_data::MouseButtonSet; use dioxus_html::on::{KeyboardEvent, MouseEvent}; use dioxus_html::KeyCode; diff --git a/packages/html/src/events.rs b/packages/html/src/events.rs index 64c9ecf68..6d7cbe06e 100644 --- a/packages/html/src/events.rs +++ b/packages/html/src/events.rs @@ -6,7 +6,7 @@ pub mod on { //! Input events and associated data use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; - use crate::input::{ + use crate::input_data::{ decode_mouse_button_set, encode_mouse_button_set, MouseButton, MouseButtonSet, }; use keyboard_types::Modifiers; diff --git a/packages/html/src/input.rs b/packages/html/src/input_data.rs similarity index 100% rename from packages/html/src/input.rs rename to packages/html/src/input_data.rs diff --git a/packages/html/src/lib.rs b/packages/html/src/lib.rs index 705a076e4..cb356af7e 100644 --- a/packages/html/src/lib.rs +++ b/packages/html/src/lib.rs @@ -17,7 +17,7 @@ mod elements; mod events; pub mod geometry; mod global_attributes; -pub mod input; +pub mod input_data; #[cfg(feature = "wasm-bind")] mod web_sys_bind; diff --git a/packages/html/src/web_sys_bind/events.rs b/packages/html/src/web_sys_bind/events.rs index 0bf1179e4..a69ac5fef 100644 --- a/packages/html/src/web_sys_bind/events.rs +++ b/packages/html/src/web_sys_bind/events.rs @@ -1,5 +1,5 @@ use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; -use crate::input::{decode_mouse_button_set, MouseButton}; +use crate::input_data::{decode_mouse_button_set, MouseButton}; use crate::on::{ AnimationData, CompositionData, KeyboardData, MouseData, PointerData, TouchData, TransitionData, WheelData, diff --git a/packages/tui/src/hooks.rs b/packages/tui/src/hooks.rs index 74af56bef..5481d6b1c 100644 --- a/packages/tui/src/hooks.rs +++ b/packages/tui/src/hooks.rs @@ -6,9 +6,9 @@ use fxhash::{FxHashMap, FxHashSet}; use dioxus_html::geometry::euclid::{Point2D, Rect, Size2D}; use dioxus_html::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; -use dioxus_html::input::keyboard_types::Modifiers; -use dioxus_html::input::MouseButtonSet as DioxusMouseButtons; -use dioxus_html::input::{MouseButton as DioxusMouseButton, MouseButtonSet}; +use dioxus_html::input_data::keyboard_types::Modifiers; +use dioxus_html::input_data::MouseButtonSet as DioxusMouseButtons; +use dioxus_html::input_data::{MouseButton as DioxusMouseButton, MouseButtonSet}; use dioxus_html::{on::*, KeyCode}; use std::{ any::Any,