Skip to content

Commit 098c595

Browse files
committed
style: rename ui::input module to ui::ui_input to avoid ambiguity in prelude re-export.
1 parent 6252237 commit 098c595

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/prelude.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub use crate::{
1010
metadata::*,
1111
platform::*,
1212
session::*,
13-
ui::{input::MenuAction, *},
13+
ui::*,
1414
utils::*,
1515
*,
1616
};

src/ui.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use bevy::ecs::system::SystemState;
22

33
use crate::prelude::*;
44

5-
use self::input::MenuAction;
5+
pub use self::ui_input::MenuAction;
66

7-
pub mod input;
7+
pub mod ui_input;
88
pub mod widgets;
99

1010
pub mod debug_tools;
@@ -17,7 +17,7 @@ pub struct JumpyUiPlugin;
1717
impl Plugin for JumpyUiPlugin {
1818
fn build(&self, app: &mut App) {
1919
app.add_plugin(bevy_egui::EguiPlugin)
20-
.add_plugin(input::UiInputPlugin)
20+
.add_plugin(ui_input::UiInputPlugin)
2121
.add_plugin(main_menu::MainMenuPlugin)
2222
.add_plugin(editor::EditorPlugin)
2323
.add_plugin(debug_tools::DebugToolsPlugin)

src/ui/main_menu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::{
1212
metadata::{GameMeta, Settings},
1313
platform::Storage,
1414
prelude::*,
15-
ui::input::MenuAction,
15+
ui::ui_input::MenuAction,
1616
};
1717

1818
use self::settings::{ModifiedSettings, SettingsTab};

src/ui/pause_menu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use bevy_egui::*;
22
use bevy_fluent::Localization;
33

44
use crate::{
5-
localization::LocalizationExt, metadata::GameMeta, prelude::*, ui::input::MenuAction,
5+
localization::LocalizationExt, metadata::GameMeta, prelude::*, ui::ui_input::MenuAction,
66
widgets::EguiResponseExt, EngineState,
77
};
88

src/ui/input.rs src/ui/ui_input.rs

File renamed without changes.

0 commit comments

Comments
 (0)