From 968cc9c94c28d2717437602cc602841bb003bde2 Mon Sep 17 00:00:00 2001 From: Tensor-Programming Date: Wed, 1 Jan 2020 16:21:06 -0500 Subject: [PATCH] Feat(Errors) add error handling (#274) * update .gitignore * remove cargo.lock * minor cleanup. --- tauri/src/app.rs | 3 ++- tauri/src/app/runner.rs | 2 +- tauri/src/lib.rs | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tauri/src/app.rs b/tauri/src/app.rs index a29b335f1..cc8ecc3b6 100644 --- a/tauri/src/app.rs +++ b/tauri/src/app.rs @@ -1,6 +1,7 @@ -mod runner; use web_view::WebView; +mod runner; + //type FnMut(&mut InvokeHandler>, &str) = FnMut(&mut FnMut(&mut InvokeHandler>, &str)>, &str); pub struct App { diff --git a/tauri/src/app/runner.rs b/tauri/src/app/runner.rs index ee15152af..7977c7f5b 100644 --- a/tauri/src/app/runner.rs +++ b/tauri/src/app/runner.rs @@ -3,10 +3,10 @@ use std::{fs::read_to_string, path::Path, process::Stdio, thread::spawn}; use web_view::{builder, Content, WebView}; +use super::App; use crate::config::{get, Config}; #[cfg(feature = "embedded-server")] use crate::tcp::{get_available_port, port_is_available}; -use crate::App; use crate::TauriResult; // JavaScript string literal diff --git a/tauri/src/lib.rs b/tauri/src/lib.rs index 096835832..a29dc649f 100644 --- a/tauri/src/lib.rs +++ b/tauri/src/lib.rs @@ -20,17 +20,16 @@ mod salt; #[cfg(feature = "embedded-server")] mod tcp; +mod app; #[cfg(not(feature = "dev-server"))] pub mod assets; -mod app; - use std::process::Stdio; use threadpool::ThreadPool; pub use app::*; -use web_view::*; +use web_view::WebView; pub use tauri_api as api;