diff --git a/Cargo.lock b/Cargo.lock index d342ea6..4b72fb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,7 +92,7 @@ dependencies = [ "thread-priority", "time", "tinyfiledialogs", - "toml 0.7.8", + "toml 0.8.8", "ureq", "uuid", "web-view", @@ -800,9 +800,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ "hashbrown", ] @@ -1236,9 +1236,9 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "sqlite" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05439db7afa0ce0b38f6d1b4c691f368adde108df021e15e900fec6a1af92488" +checksum = "03801c10193857d6a4a71ec46cee198a15cbc659622aabe1db0d0bdbefbcf8e6" dependencies = [ "libc", "sqlite3-sys", @@ -1356,9 +1356,9 @@ dependencies = [ [[package]] name = "thread-priority" -version = "0.13.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c56ce92f1285eaaa11fc1a3201e25de97898c50e87caa4c2aee836fe05288de" +checksum = "b72cb4958060ee2d9540cef68bb3871fd1e547037772c7fe7650d5d1cbec53b3" dependencies = [ "bitflags", "cfg-if", @@ -1435,9 +1435,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -1456,9 +1456,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -1640,7 +1640,7 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-view" version = "0.7.3" -source = "git+https://github.com/Boscop/web-view#e87e08cab3a2d500d54068ec9c7aaa055a711465" +source = "git+https://github.com/Boscop/web-view#82d7cbce6228b1a964673cc0f22944ad808eab42" dependencies = [ "boxfnonce", "tinyfiledialogs", diff --git a/Cargo.toml b/Cargo.toml index e0b14d2..15192cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ exclude = ["blockchain.db", "alfis.toml"] getopts = "0.2.21" log = "0.4.17" simplelog = "0.12.0" -toml = "0.7.2" +toml = "0.8.8" digest = "0.10.5" sha2 = "0.10.6" ed25519-dalek = "2.0.0" @@ -35,11 +35,11 @@ num-traits = "0.2.15" chrono = { version = "0.4.20", features = ["serde"] } time = "0.3.14" rand = { package = "rand", version = "0.8.5" } -sqlite = "0.31.0" +sqlite = "0.32.0" uuid = { version = "1.3.0", features = ["serde", "v4"] } mio = { version = "0.8.9", features = ["os-poll", "net"] } ureq = { version = "2.9", optional = true, git = "https://github.com/algesten/ureq" } -lru = "0.11.0" +lru = "0.12" derive_more = "0.99.17" lazy_static = "1.4.0" spmc = "0.3.0" @@ -52,10 +52,10 @@ open = { version = "5.0.0", optional = true } [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.9", features = ["impl-default", "wincon", "shellscalingapi"] } windows-service = "0.6.0" -thread-priority = "0.13.1" +thread-priority = "0.15.1" [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies] -thread-priority = "0.13.1" +thread-priority = "0.15.1" [build-dependencies] winres = "0.1.12" diff --git a/src/main.rs b/src/main.rs index b39cc88..954ff91 100644 --- a/src/main.rs +++ b/src/main.rs @@ -101,7 +101,7 @@ fn main() { // Create a new directory inside the AppData directory let new_directory = format!("{}\\ALFIS", progdata); - fs::create_dir_all(&new_directory).expect("Failed to create directory"); + std::fs::create_dir_all(&new_directory).expect("Failed to create directory"); // Change the current directory to the new directory env::set_current_dir(&new_directory).expect("Failed to change directory"); @@ -163,10 +163,7 @@ fn main() { if let Some(path) = opt_matches.opt_str("w") { env::set_current_dir(Path::new(&path)).unwrap_or_else(|_| panic!("Unable to change working directory to '{}'", &path)); } - let config_name = match opt_matches.opt_str("c") { - None => SETTINGS_FILENAME.to_owned(), - Some(path) => path - }; + let config_name = opt_matches.opt_str("c").unwrap_or_else(|| SETTINGS_FILENAME.to_owned()); setup_logger(&opt_matches, console_attached); if let Some(status) = opt_matches.opt_str("s") {