rust code cleanup

src-tauri/Cargo.toml

@@ -18,7 +18,6 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "1.5.0", features = [] }
 
 [dependencies]
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_repr = "0.1.16"
@@ -40,6 +39,7 @@ pathdiff = "0.2.1"
 libssh-rs = { version = "0.2.1", features = ["vendored"] }
 libssh-rs-sys = "0.2.1"
 flate2 = "1.0"
+regex = "1.10.2"
 
 [dependencies.tauri]
 version = "1.5.2"
@@ -57,6 +57,10 @@ features = ["windows_dpi_awareness", "windows_visual_styles"]
 [dependencies.openssl]
 version = "0.10.57"
 
+[dependencies.tauri-plugin-single-instance]
+git = "https://github.com/tauri-apps/plugins-workspace"
+branch = "dev"
+
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL

src-tauri/src/conn_pool/connection.rs

@@ -5,7 +5,7 @@ use std::sync::Mutex;
 use std::time::Duration;
 
 use libssh_rs::{AuthStatus, Session, SshKey, SshOption};
-use tauri::regex::Regex;
+use regex::Regex;
 use uuid::Uuid;
 
 use crate::conn_pool::{DeviceConnection, DeviceConnectionUserInfo, Id};

src-tauri/src/error.rs

@@ -4,9 +4,9 @@ use std::io::ErrorKind;
 use std::str::FromStr;
 
 use libssh_rs::{Error as SshError, SftpError};
+use regex::Regex;
 use reqwest::StatusCode;
 use serde::{Serialize, Serializer};
-use tauri::regex::Regex;
 
 #[derive(Debug, Serialize, Clone)]
 #[serde(tag = "reason")]

src-tauri/src/lib.rs

@@ -20,7 +20,6 @@ mod session_manager;
 mod shell_manager;
 mod spawn_manager;
 
-
 //#[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     env_logger::builder().filter_level(LevelFilter::Debug).init();

src-tauri/src/plugins/devmode.rs

@@ -1,10 +1,10 @@
-use reqwest::Url;
 use std::io::Read;
 
+use regex::Regex;
+use reqwest::Url;
 use serde::{Deserialize, Serialize};
-use tauri::plugin::{Builder, TauriPlugin};
-use tauri::regex::Regex;
 use tauri::{AppHandle, Manager, Runtime};
+use tauri::plugin::{Builder, TauriPlugin};
 
 use crate::device_manager::Device;
 use crate::error::Error;