refactor: move rust crates into crates dir

goweiwen · Jun 2, 2024 · 9f64ae8 · 9f64ae8
1 parent 99467df
commit 9f64ae8
Show file tree

Hide file tree

Showing 114 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
 members = [
-    "common",
-    "alliumd",
-    "allium-launcher",
-    "allium-menu",
-    "activity-tracker",
-    "ffi",
-    "myctl",
-    "say",
-    "screenshot",
-    "show",
-    "show-hotkeys",
+    "crates/common",
+    "crates/alliumd",
+    "crates/allium-launcher",
+    "crates/allium-menu",
+    "crates/activity-tracker",
+    "crates/ffi",
+    "crates/myctl",
+    "crates/say",
+    "crates/screenshot",
+    "crates/show",
+    "crates/show-hotkeys",
 ]
 exclude = [
     "third-party/dufs"

diff --git a/activity-tracker/Cargo.toml → crates/activity-tracker/Cargo.toml b/activity-tracker/Cargo.toml → crates/activity-tracker/Cargo.toml
diff --git a/activity-tracker/src/activity_tracker.rs → .../activity-tracker/src/activity_tracker.rs b/activity-tracker/src/activity_tracker.rs → .../activity-tracker/src/activity_tracker.rs
diff --git a/activity-tracker/src/main.rs → crates/activity-tracker/src/main.rs b/activity-tracker/src/main.rs → crates/activity-tracker/src/main.rs
diff --git a/...vity-tracker/src/view/activity_tracker.rs → ...vity-tracker/src/view/activity_tracker.rs b/...vity-tracker/src/view/activity_tracker.rs → ...vity-tracker/src/view/activity_tracker.rs
diff --git a/activity-tracker/src/view/app.rs → crates/activity-tracker/src/view/app.rs b/activity-tracker/src/view/app.rs → crates/activity-tracker/src/view/app.rs
diff --git a/activity-tracker/src/view/mod.rs → crates/activity-tracker/src/view/mod.rs b/activity-tracker/src/view/mod.rs → crates/activity-tracker/src/view/mod.rs
diff --git a/allium-launcher/Cargo.toml → crates/allium-launcher/Cargo.toml b/allium-launcher/Cargo.toml → crates/allium-launcher/Cargo.toml
diff --git a/allium-launcher/src/allium_launcher.rs → ...es/allium-launcher/src/allium_launcher.rs b/allium-launcher/src/allium_launcher.rs → ...es/allium-launcher/src/allium_launcher.rs
diff --git a/allium-launcher/src/consoles.rs → crates/allium-launcher/src/consoles.rs b/allium-launcher/src/consoles.rs → crates/allium-launcher/src/consoles.rs
diff --git a/allium-launcher/src/entry/app.rs → crates/allium-launcher/src/entry/app.rs b/allium-launcher/src/entry/app.rs → crates/allium-launcher/src/entry/app.rs
diff --git a/allium-launcher/src/entry/directory.rs → ...es/allium-launcher/src/entry/directory.rs b/allium-launcher/src/entry/directory.rs → ...es/allium-launcher/src/entry/directory.rs
diff --git a/allium-launcher/src/entry/game.rs → crates/allium-launcher/src/entry/game.rs b/allium-launcher/src/entry/game.rs → crates/allium-launcher/src/entry/game.rs
diff --git a/allium-launcher/src/entry/gamelist.rs → crates/allium-launcher/src/entry/gamelist.rs b/allium-launcher/src/entry/gamelist.rs → crates/allium-launcher/src/entry/gamelist.rs
diff --git a/allium-launcher/src/entry/lazy_image.rs → ...s/allium-launcher/src/entry/lazy_image.rs b/allium-launcher/src/entry/lazy_image.rs → ...s/allium-launcher/src/entry/lazy_image.rs
diff --git a/allium-launcher/src/entry/mod.rs → crates/allium-launcher/src/entry/mod.rs b/allium-launcher/src/entry/mod.rs → crates/allium-launcher/src/entry/mod.rs
diff --git a/allium-launcher/src/entry/test/gamelist.xml → ...lium-launcher/src/entry/test/gamelist.xml b/allium-launcher/src/entry/test/gamelist.xml → ...lium-launcher/src/entry/test/gamelist.xml
diff --git a/allium-launcher/src/main.rs → crates/allium-launcher/src/main.rs b/allium-launcher/src/main.rs → crates/allium-launcher/src/main.rs
diff --git a/allium-launcher/src/view/app.rs → crates/allium-launcher/src/view/app.rs b/allium-launcher/src/view/app.rs → crates/allium-launcher/src/view/app.rs
diff --git a/allium-launcher/src/view/apps.rs → crates/allium-launcher/src/view/apps.rs b/allium-launcher/src/view/apps.rs → crates/allium-launcher/src/view/apps.rs
diff --git a/allium-launcher/src/view/entry_list.rs → ...es/allium-launcher/src/view/entry_list.rs b/allium-launcher/src/view/entry_list.rs → ...es/allium-launcher/src/view/entry_list.rs
diff --git a/allium-launcher/src/view/games.rs → crates/allium-launcher/src/view/games.rs b/allium-launcher/src/view/games.rs → crates/allium-launcher/src/view/games.rs
diff --git a/allium-launcher/src/view/mod.rs → crates/allium-launcher/src/view/mod.rs b/allium-launcher/src/view/mod.rs → crates/allium-launcher/src/view/mod.rs
diff --git a/allium-launcher/src/view/recents.rs → crates/allium-launcher/src/view/recents.rs b/allium-launcher/src/view/recents.rs → crates/allium-launcher/src/view/recents.rs
diff --git a/allium-launcher/src/view/settings/about.rs → ...llium-launcher/src/view/settings/about.rs b/allium-launcher/src/view/settings/about.rs → ...llium-launcher/src/view/settings/about.rs
diff --git a/allium-launcher/src/view/settings/clock.rs → ...llium-launcher/src/view/settings/clock.rs b/allium-launcher/src/view/settings/clock.rs → ...llium-launcher/src/view/settings/clock.rs
diff --git a/allium-launcher/src/view/settings/display.rs → ...ium-launcher/src/view/settings/display.rs b/allium-launcher/src/view/settings/display.rs → ...ium-launcher/src/view/settings/display.rs
diff --git a/...um-launcher/src/view/settings/language.rs → ...um-launcher/src/view/settings/language.rs b/...um-launcher/src/view/settings/language.rs → ...um-launcher/src/view/settings/language.rs
diff --git a/allium-launcher/src/view/settings/mod.rs → .../allium-launcher/src/view/settings/mod.rs b/allium-launcher/src/view/settings/mod.rs → .../allium-launcher/src/view/settings/mod.rs
diff --git a/allium-launcher/src/view/settings/power.rs → ...llium-launcher/src/view/settings/power.rs b/allium-launcher/src/view/settings/power.rs → ...llium-launcher/src/view/settings/power.rs
diff --git a/allium-launcher/src/view/settings/theme.rs → ...llium-launcher/src/view/settings/theme.rs b/allium-launcher/src/view/settings/theme.rs → ...llium-launcher/src/view/settings/theme.rs
diff --git a/allium-launcher/src/view/settings/wifi.rs → ...allium-launcher/src/view/settings/wifi.rs b/allium-launcher/src/view/settings/wifi.rs → ...allium-launcher/src/view/settings/wifi.rs
diff --git a/allium-launcher/src/view/toast.rs → crates/allium-launcher/src/view/toast.rs b/allium-launcher/src/view/toast.rs → crates/allium-launcher/src/view/toast.rs
diff --git a/allium-menu/Cargo.toml → crates/allium-menu/Cargo.toml b/allium-menu/Cargo.toml → crates/allium-menu/Cargo.toml
diff --git a/allium-menu/src/allium_menu.rs → crates/allium-menu/src/allium_menu.rs b/allium-menu/src/allium_menu.rs → crates/allium-menu/src/allium_menu.rs
diff --git a/allium-menu/src/main.rs → crates/allium-menu/src/main.rs b/allium-menu/src/main.rs → crates/allium-menu/src/main.rs
diff --git a/allium-menu/src/retroarch_info.rs → crates/allium-menu/src/retroarch_info.rs b/allium-menu/src/retroarch_info.rs → crates/allium-menu/src/retroarch_info.rs
diff --git a/allium-menu/src/view/ingame_menu.rs → crates/allium-menu/src/view/ingame_menu.rs b/allium-menu/src/view/ingame_menu.rs → crates/allium-menu/src/view/ingame_menu.rs
diff --git a/allium-menu/src/view/mod.rs → crates/allium-menu/src/view/mod.rs b/allium-menu/src/view/mod.rs → crates/allium-menu/src/view/mod.rs
diff --git a/allium-menu/src/view/text_reader.rs → crates/allium-menu/src/view/text_reader.rs b/allium-menu/src/view/text_reader.rs → crates/allium-menu/src/view/text_reader.rs
diff --git a/alliumd/Cargo.toml → crates/alliumd/Cargo.toml b/alliumd/Cargo.toml → crates/alliumd/Cargo.toml
diff --git a/alliumd/src/alliumd.rs → crates/alliumd/src/alliumd.rs b/alliumd/src/alliumd.rs → crates/alliumd/src/alliumd.rs
diff --git a/alliumd/src/main.rs → crates/alliumd/src/main.rs b/alliumd/src/main.rs → crates/alliumd/src/main.rs
diff --git a/common/Cargo.toml → crates/common/Cargo.toml b/common/Cargo.toml → crates/common/Cargo.toml
diff --git a/common/src/battery.rs → crates/common/src/battery.rs b/common/src/battery.rs → crates/common/src/battery.rs
diff --git a/common/src/command.rs → crates/common/src/command.rs b/common/src/command.rs → crates/common/src/command.rs
diff --git a/common/src/constants.rs → crates/common/src/constants.rs b/common/src/constants.rs → crates/common/src/constants.rs
diff --git a/common/src/database.rs → crates/common/src/database.rs b/common/src/database.rs → crates/common/src/database.rs
diff --git a/common/src/display/color.rs → crates/common/src/display/color.rs b/common/src/display/color.rs → crates/common/src/display/color.rs
diff --git a/common/src/display/font.rs → crates/common/src/display/font.rs b/common/src/display/font.rs → crates/common/src/display/font.rs
diff --git a/common/src/display/image.rs → crates/common/src/display/image.rs b/common/src/display/image.rs → crates/common/src/display/image.rs
diff --git a/common/src/display/mod.rs → crates/common/src/display/mod.rs b/common/src/display/mod.rs → crates/common/src/display/mod.rs
diff --git a/common/src/display/settings.rs → crates/common/src/display/settings.rs b/common/src/display/settings.rs → crates/common/src/display/settings.rs
diff --git a/common/src/game_info.rs → crates/common/src/game_info.rs b/common/src/game_info.rs → crates/common/src/game_info.rs
diff --git a/common/src/geom/mod.rs → crates/common/src/geom/mod.rs b/common/src/geom/mod.rs → crates/common/src/geom/mod.rs
diff --git a/common/src/lib.rs → crates/common/src/lib.rs b/common/src/lib.rs → crates/common/src/lib.rs
diff --git a/common/src/locale.rs → crates/common/src/locale.rs b/common/src/locale.rs → crates/common/src/locale.rs
diff --git a/...on/src/platform/miyoo/battery/miyoo283.rs → ...on/src/platform/miyoo/battery/miyoo283.rs b/...on/src/platform/miyoo/battery/miyoo283.rs → ...on/src/platform/miyoo/battery/miyoo283.rs
diff --git a/...on/src/platform/miyoo/battery/miyoo354.rs → ...on/src/platform/miyoo/battery/miyoo354.rs b/...on/src/platform/miyoo/battery/miyoo354.rs → ...on/src/platform/miyoo/battery/miyoo354.rs
diff --git a/common/src/platform/miyoo/battery/mod.rs → .../common/src/platform/miyoo/battery/mod.rs b/common/src/platform/miyoo/battery/mod.rs → .../common/src/platform/miyoo/battery/mod.rs
diff --git a/common/src/platform/miyoo/evdev.rs → crates/common/src/platform/miyoo/evdev.rs b/common/src/platform/miyoo/evdev.rs → crates/common/src/platform/miyoo/evdev.rs
diff --git a/common/src/platform/miyoo/framebuffer.rs → .../common/src/platform/miyoo/framebuffer.rs b/common/src/platform/miyoo/framebuffer.rs → .../common/src/platform/miyoo/framebuffer.rs
diff --git a/common/src/platform/miyoo/mod.rs → crates/common/src/platform/miyoo/mod.rs b/common/src/platform/miyoo/mod.rs → crates/common/src/platform/miyoo/mod.rs
diff --git a/common/src/platform/miyoo/screen.rs → crates/common/src/platform/miyoo/screen.rs b/common/src/platform/miyoo/screen.rs → crates/common/src/platform/miyoo/screen.rs
diff --git a/common/src/platform/miyoo/volume.rs → crates/common/src/platform/miyoo/volume.rs b/common/src/platform/miyoo/volume.rs → crates/common/src/platform/miyoo/volume.rs
diff --git a/common/src/platform/mock.rs → crates/common/src/platform/mock.rs b/common/src/platform/mock.rs → crates/common/src/platform/mock.rs
diff --git a/common/src/platform/mod.rs → crates/common/src/platform/mod.rs b/common/src/platform/mod.rs → crates/common/src/platform/mod.rs
diff --git a/common/src/platform/simulator.rs → crates/common/src/platform/simulator.rs b/common/src/platform/simulator.rs → crates/common/src/platform/simulator.rs
diff --git a/common/src/power.rs → crates/common/src/power.rs b/common/src/power.rs → crates/common/src/power.rs
diff --git a/common/src/resources.rs → crates/common/src/resources.rs b/common/src/resources.rs → crates/common/src/resources.rs
diff --git a/common/src/retroarch.rs → crates/common/src/retroarch.rs b/common/src/retroarch.rs → crates/common/src/retroarch.rs
diff --git a/common/src/stylesheet.rs → crates/common/src/stylesheet.rs b/common/src/stylesheet.rs → crates/common/src/stylesheet.rs
diff --git a/common/src/view/battery_indicator.rs → crates/common/src/view/battery_indicator.rs b/common/src/view/battery_indicator.rs → crates/common/src/view/battery_indicator.rs
diff --git a/common/src/view/button_hint.rs → crates/common/src/view/button_hint.rs b/common/src/view/button_hint.rs → crates/common/src/view/button_hint.rs
diff --git a/common/src/view/button_icon.rs → crates/common/src/view/button_icon.rs b/common/src/view/button_icon.rs → crates/common/src/view/button_icon.rs
diff --git a/common/src/view/clock.rs → crates/common/src/view/clock.rs b/common/src/view/clock.rs → crates/common/src/view/clock.rs
diff --git a/common/src/view/image.rs → crates/common/src/view/image.rs b/common/src/view/image.rs → crates/common/src/view/image.rs
diff --git a/common/src/view/input/button.rs → crates/common/src/view/input/button.rs b/common/src/view/input/button.rs → crates/common/src/view/input/button.rs
diff --git a/common/src/view/input/color_picker.rs → crates/common/src/view/input/color_picker.rs b/common/src/view/input/color_picker.rs → crates/common/src/view/input/color_picker.rs
diff --git a/common/src/view/input/datetime.rs → crates/common/src/view/input/datetime.rs b/common/src/view/input/datetime.rs → crates/common/src/view/input/datetime.rs
diff --git a/common/src/view/input/keyboard.rs → crates/common/src/view/input/keyboard.rs b/common/src/view/input/keyboard.rs → crates/common/src/view/input/keyboard.rs
diff --git a/common/src/view/input/mod.rs → crates/common/src/view/input/mod.rs b/common/src/view/input/mod.rs → crates/common/src/view/input/mod.rs
diff --git a/common/src/view/input/number.rs → crates/common/src/view/input/number.rs b/common/src/view/input/number.rs → crates/common/src/view/input/number.rs
diff --git a/common/src/view/input/percentage.rs → crates/common/src/view/input/percentage.rs b/common/src/view/input/percentage.rs → crates/common/src/view/input/percentage.rs
diff --git a/common/src/view/input/select.rs → crates/common/src/view/input/select.rs b/common/src/view/input/select.rs → crates/common/src/view/input/select.rs
diff --git a/common/src/view/input/text_box.rs → crates/common/src/view/input/text_box.rs b/common/src/view/input/text_box.rs → crates/common/src/view/input/text_box.rs
diff --git a/common/src/view/input/toggle.rs → crates/common/src/view/input/toggle.rs b/common/src/view/input/toggle.rs → crates/common/src/view/input/toggle.rs
diff --git a/common/src/view/label.rs → crates/common/src/view/label.rs b/common/src/view/label.rs → crates/common/src/view/label.rs
diff --git a/common/src/view/list.rs → crates/common/src/view/list.rs b/common/src/view/list.rs → crates/common/src/view/list.rs
diff --git a/common/src/view/mod.rs → crates/common/src/view/mod.rs b/common/src/view/mod.rs → crates/common/src/view/mod.rs
diff --git a/common/src/view/null.rs → crates/common/src/view/null.rs b/common/src/view/null.rs → crates/common/src/view/null.rs
diff --git a/common/src/view/row.rs → crates/common/src/view/row.rs b/common/src/view/row.rs → crates/common/src/view/row.rs
diff --git a/common/src/view/scroll_list.rs → crates/common/src/view/scroll_list.rs b/common/src/view/scroll_list.rs → crates/common/src/view/scroll_list.rs
diff --git a/common/src/view/settings_list.rs → crates/common/src/view/settings_list.rs b/common/src/view/settings_list.rs → crates/common/src/view/settings_list.rs
diff --git a/common/src/wifi.rs → crates/common/src/wifi.rs b/common/src/wifi.rs → crates/common/src/wifi.rs
diff --git a/ffi/Cargo.toml → crates/ffi/Cargo.toml b/ffi/Cargo.toml → crates/ffi/Cargo.toml
diff --git a/ffi/build.rs → crates/ffi/build.rs b/ffi/build.rs → crates/ffi/build.rs
@@ -9,7 +9,7 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     let bindings = bindgen::Builder::default()
-        .header("../third-party/my283/usr/include/mi_ao.h")
+        .header("../../third-party/my283/usr/include/mi_ao.h")
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
         .generate()
         .expect("Unable to generate bindings");

diff --git a/ffi/src/lib.rs → crates/ffi/src/lib.rs b/ffi/src/lib.rs → crates/ffi/src/lib.rs
diff --git a/myctl/Cargo.toml → crates/myctl/Cargo.toml b/myctl/Cargo.toml → crates/myctl/Cargo.toml
diff --git a/myctl/src/display.rs → crates/myctl/src/display.rs b/myctl/src/display.rs → crates/myctl/src/display.rs
diff --git a/myctl/src/main.rs → crates/myctl/src/main.rs b/myctl/src/main.rs → crates/myctl/src/main.rs
diff --git a/myctl/src/volume.rs → crates/myctl/src/volume.rs b/myctl/src/volume.rs → crates/myctl/src/volume.rs
diff --git a/say/Cargo.toml → crates/say/Cargo.toml b/say/Cargo.toml → crates/say/Cargo.toml
diff --git a/say/src/main.rs → crates/say/src/main.rs b/say/src/main.rs → crates/say/src/main.rs
diff --git a/screenshot/Cargo.toml → crates/screenshot/Cargo.toml b/screenshot/Cargo.toml → crates/screenshot/Cargo.toml
diff --git a/screenshot/src/main.rs → crates/screenshot/src/main.rs b/screenshot/src/main.rs → crates/screenshot/src/main.rs
diff --git a/show-hotkeys/Cargo.toml → crates/show-hotkeys/Cargo.toml b/show-hotkeys/Cargo.toml → crates/show-hotkeys/Cargo.toml
diff --git a/show-hotkeys/src/app.rs → crates/show-hotkeys/src/app.rs b/show-hotkeys/src/app.rs → crates/show-hotkeys/src/app.rs
diff --git a/show-hotkeys/src/main.rs → crates/show-hotkeys/src/main.rs b/show-hotkeys/src/main.rs → crates/show-hotkeys/src/main.rs
diff --git a/show-hotkeys/src/view/button_chord.rs → crates/show-hotkeys/src/view/button_chord.rs b/show-hotkeys/src/view/button_chord.rs → crates/show-hotkeys/src/view/button_chord.rs
diff --git a/show-hotkeys/src/view/hotkeys.rs → crates/show-hotkeys/src/view/hotkeys.rs b/show-hotkeys/src/view/hotkeys.rs → crates/show-hotkeys/src/view/hotkeys.rs
diff --git a/show-hotkeys/src/view/mod.rs → crates/show-hotkeys/src/view/mod.rs b/show-hotkeys/src/view/mod.rs → crates/show-hotkeys/src/view/mod.rs
diff --git a/show/Cargo.toml → crates/show/Cargo.toml b/show/Cargo.toml → crates/show/Cargo.toml
diff --git a/show/src/main.rs → crates/show/src/main.rs b/show/src/main.rs → crates/show/src/main.rs