Fix: compile without default features

ur-fault · May 28, 2024 · 5038d73 · 5038d73
1 parent 546bb7f
commit 5038d73
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tmaze/examples/updates.rs b/tmaze/examples/updates.rs
@@ -4,9 +4,12 @@ use tmaze::{
         Activity, ActivityHandler,
     },
     ui::Popup,
-    updates::UpdateCheckerActivity,
 };
 
+#[cfg(feature = "updates")]
+use tmaze::updates::UpdateCheckerActivity;
+
+#[cfg(feature = "updates")]
 fn main() {
     let mut app = App::new(Activity::new_base(
         "activity",
@@ -19,8 +22,15 @@ fn main() {
     app.run();
 }
 
+#[cfg(not(feature = "updates"))]
+fn main() {
+    panic!("Cannot run `updates` example without the `updates` feature");
+}
+
+#[cfg(feature = "updates")]
 struct MyActivity(bool, Popup);
 
+#[cfg(feature = "updates")]
 impl ActivityHandler for MyActivity {
     fn update(
         &mut self,

diff --git a/tmaze/src/app/app.rs b/tmaze/src/app/app.rs
@@ -3,7 +3,6 @@ use std::time::{Duration, Instant};
 use cmaze::core::Dims;
 
 use crossterm::event::{read, KeyCode, KeyEvent, KeyEventKind};
-use rodio::Source;
 
 use crate::{
     data::SaveData,
@@ -15,6 +14,9 @@ use crate::{
 #[cfg(feature = "sound")]
 use crate::sound::{track::MusicTrack, SoundPlayer};
 
+#[cfg(feature = "sound")]
+use rodio::Source;
+
 use super::{
     activity::{Activities, Activity, ActivityResult, Change},
     event::Event,

diff --git a/tmaze/src/app/game.rs b/tmaze/src/app/game.rs
@@ -17,7 +17,6 @@ use crate::{
     renderer::Frame,
     settings::{CameraMode, ColorScheme, Offset, Settings},
     ui::{self, draw_box, multisize_string, Menu, Popup, ProgressBar, Screen},
-    updates::UpdateCheckerActivity,
 };
 
 #[cfg(feature = "sound")]
@@ -26,7 +25,7 @@ use crate::sound::{track::MusicTrack, SoundPlayer};
 
 #[cfg(feature = "updates")]
 #[allow(unused_imports)]
-use crate::updates;
+use crate::updates::UpdateCheckerActivity;
 
 use crossterm::event::{Event as TermEvent, KeyCode, KeyEvent};
 
@@ -66,6 +65,8 @@ pub fn create_controls_popup() -> Activity {
 
 pub struct MainMenu {
     menu: Menu,
+
+    #[cfg(feature = "updates")]
     update_checked: bool,
 }
 
@@ -89,6 +90,8 @@ impl MainMenu {
                 .box_style(color_scheme.normals())
                 .text_style(color_scheme.texts()),
             ),
+
+            #[cfg(feature = "updates")]
             update_checked: false,
         }
     }
@@ -148,6 +151,7 @@ impl ActivityHandler for MainMenu {
         #[cfg(feature = "sound")]
         Self::play_menu_bgm(data);
 
+        #[cfg(feature = "updates")]
         if !self.update_checked {
             self.update_checked = true;
             return Some(Change::push(Activity::new_base(