Skip to content

Commit 765baf6

Browse files
committed
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 rust-lang/rust#96934
1 parent 90cb221 commit 765baf6

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

examples/tui_keys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use dioxus::events::WheelEvent;
22
use dioxus::prelude::*;
33
use dioxus_html::geometry::ScreenPoint;
4-
use dioxus_html::input::MouseButtonSet;
4+
use dioxus_html::input_data::MouseButtonSet;
55
use dioxus_html::on::{KeyboardEvent, MouseEvent};
66
use dioxus_html::KeyCode;
77

packages/html/src/events.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub mod on {
66
//! Input events and associated data
77
88
use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
9-
use crate::input::{
9+
use crate::input_data::{
1010
decode_mouse_button_set, encode_mouse_button_set, MouseButton, MouseButtonSet,
1111
};
1212
use keyboard_types::Modifiers;
File renamed without changes.

packages/html/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod elements;
1717
mod events;
1818
pub mod geometry;
1919
mod global_attributes;
20-
pub mod input;
20+
pub mod input_data;
2121
#[cfg(feature = "wasm-bind")]
2222
mod web_sys_bind;
2323

packages/html/src/web_sys_bind/events.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
2-
use crate::input::{decode_mouse_button_set, MouseButton};
2+
use crate::input_data::{decode_mouse_button_set, MouseButton};
33
use crate::on::{
44
AnimationData, CompositionData, KeyboardData, MouseData, PointerData, TouchData,
55
TransitionData, WheelData,

packages/tui/src/hooks.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use fxhash::{FxHashMap, FxHashSet};
66

77
use dioxus_html::geometry::euclid::{Point2D, Rect, Size2D};
88
use dioxus_html::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
9-
use dioxus_html::input::keyboard_types::Modifiers;
10-
use dioxus_html::input::MouseButtonSet as DioxusMouseButtons;
11-
use dioxus_html::input::{MouseButton as DioxusMouseButton, MouseButtonSet};
9+
use dioxus_html::input_data::keyboard_types::Modifiers;
10+
use dioxus_html::input_data::MouseButtonSet as DioxusMouseButtons;
11+
use dioxus_html::input_data::{MouseButton as DioxusMouseButton, MouseButtonSet};
1212
use dioxus_html::{on::*, KeyCode};
1313
use std::{
1414
any::Any,

0 commit comments

Comments
 (0)