Bladeren bron

chore: cleanup setup error usage (#1588)

Lucas Fernandes Nogueira 4 jaren geleden
bovenliggende
commit
0234336d6a
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      core/tauri/src/error.rs
  2. 1 1
      core/tauri/src/runtime/app.rs

+ 2 - 2
core/tauri/src/error.rs

@@ -51,8 +51,8 @@ pub enum Error {
   #[error("invalid args for command `{0}`: {1}")]
   InvalidArgs(&'static str, serde_json::Error),
   /// Encountered an error in the setup hook,
-  #[error("error encountered during setup hood: {0}")]
-  Setup(#[from] Box<dyn std::error::Error>),
+  #[error("error encountered during setup hook: {0}")]
+  Setup(String),
   /// Tauri updater error.
   #[cfg(feature = "updater")]
   #[error("Updater: {0}")]

+ 1 - 1
core/tauri/src/runtime/app.rs

@@ -262,7 +262,7 @@ where
     #[cfg(feature = "updater")]
     app.run_updater(main_window);
 
-    (self.setup)(&mut app)?;
+    (self.setup)(&mut app).map_err(|e| crate::Error::Setup(e.to_string()))?;
     app.runtime.run();
     Ok(())
   }