Replace lazy_static with once_cell

`once_cell` is a simpler macroless alternative that will be added to the standard library.
This commit is contained in:
Brian Bowman
2022-07-09 05:53:13 -05:00
parent c3119ce7a7
commit e75474fde7
5 changed files with 10 additions and 25 deletions

6
src-tauri/Cargo.lock generated
View File

@@ -723,7 +723,7 @@ dependencies = [
"http", "http",
"hudsucker", "hudsucker",
"is_elevated", "is_elevated",
"lazy_static", "once_cell",
"open", "open",
"rcgen", "rcgen",
"registry", "registry",
@@ -2354,9 +2354,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.10.0" version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
[[package]] [[package]]
name = "opaque-debug" name = "opaque-debug"

View File

@@ -33,7 +33,7 @@ zip-extract = "0.1.1"
zip = "0.6.2" zip = "0.6.2"
# For creating a "global" downloads list. # For creating a "global" downloads list.
lazy_static = "1.4.0" once_cell = "1.13.0"
# Program opener. # Program opener.
open = "2.1.2" open = "2.1.2"

View File

@@ -1,4 +1,4 @@
use lazy_static::lazy_static; use once_cell::sync::Lazy;
use std::sync::Mutex; use std::sync::Mutex;
use std::cmp::min; use std::cmp::min;
@@ -8,12 +8,7 @@ use std::io::Write;
use futures_util::StreamExt; use futures_util::StreamExt;
// This will create a downloads list that will be used to check if we should continue downloading the file // This will create a downloads list that will be used to check if we should continue downloading the file
lazy_static! { static DOWNLOADS: Lazy<Mutex<Vec<String>>> = Lazy::new(|| Mutex::new(Vec::new()));
static ref DOWNLOADS: Mutex<Vec<String>> = {
let m = Vec::new();
Mutex::new(m)
};
}
// Lots of help from: https://gist.github.com/giuliano-oliveira/4d11d6b3bb003dba3a1b53f43d81b30d // Lots of help from: https://gist.github.com/giuliano-oliveira/4d11d6b3bb003dba3a1b53f43d81b30d
// and docs ofc // and docs ofc

View File

@@ -3,7 +3,7 @@ all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows" windows_subsystem = "windows"
)] )]
use lazy_static::lazy_static; use once_cell::sync::Lazy;
use std::{sync::Mutex, collections::HashMap}; use std::{sync::Mutex, collections::HashMap};
use std::path::PathBuf; use std::path::PathBuf;
@@ -20,12 +20,7 @@ mod lang;
mod proxy; mod proxy;
mod web; mod web;
lazy_static! { static WATCH_GAME_PROCESS: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new(String::new()));
static ref WATCH_GAME_PROCESS: Mutex<String> = {
let m = "".to_string();
Mutex::new(m)
};
}
fn main() { fn main() {
// Start the game process watcher. // Start the game process watcher.

View File

@@ -3,7 +3,7 @@
* https://github.com/omjadas/hudsucker/blob/main/examples/log.rs * https://github.com/omjadas/hudsucker/blob/main/examples/log.rs
*/ */
use lazy_static::lazy_static; use once_cell::sync::Lazy;
use std::{sync::Mutex, str::FromStr}; use std::{sync::Mutex, str::FromStr};
use rcgen::*; use rcgen::*;
@@ -30,12 +30,7 @@ async fn shutdown_signal() {
} }
// Global ver for getting server address. // Global ver for getting server address.
lazy_static! { static SERVER: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new("http://localhost:443".to_string()));
static ref SERVER: Mutex<String> = {
let m = "http://localhost:443".to_string();
Mutex::new(m)
};
}
#[derive(Clone)] #[derive(Clone)]
struct ProxyHandler; struct ProxyHandler;