change lazy static dep

Cargo.toml

@@ -23,11 +23,11 @@ winapi = { version = "^0.3.9", features = [
 encoding_rs = "*"
 encoding_rs_io = "*"
 regex = "*"
-toml = "0.7.6"
-lazy_static = "1.4.0"
+toml = "0.8.0"
 exe = "0.5.6"
 walkdir = "2.3.3"
 backtrace = "0.3.69"
 chrono = "0.4.26"
 serde_derive = "1.0.164"
 serde = "1.0.185"
+static_init = "1.0.3"

src/config.rs

@@ -1,18 +1,21 @@
 use std::error::Error;
 use std::path::Path;
 
+use crate::utils;
 use exe::{VecPE, PE};
+use static_init::dynamic;
 use walkdir::WalkDir;
 
-use crate::utils;
-
 static EXE_FILE: &str = "./Dwarf Fortress.exe";
 static CONFIG_FILE: &str = "./dfint_data/dfint_config.toml";
 static OFFSETS_DIR: &str = "./dfint_data/offsets/";
 
-lazy_static! {
-  pub static ref CONFIG: Config = Config::new().unwrap();
-}
+#[dynamic]
+pub static CONFIG: Config = Config::new().unwrap();
+
+// lazy_static! {
+//   pub static ref CONFIG: Config = Config::new().unwrap();
+// }
 
 pub struct Config {
   pub metadata: ConfigMetadata,

src/dictionary.rs

@@ -6,12 +6,12 @@ use std::io::prelude::*;
 use encoding_rs::WINDOWS_1251;
 use encoding_rs_io::DecodeReaderBytesBuilder;
 use regex::Regex;
+use static_init::dynamic;
 
 use crate::config::CONFIG;
 
-lazy_static! {
-  pub static ref DICTIONARY: Dictionary = Dictionary::new(&CONFIG.settings.dictionary);
-}
+#[dynamic]
+pub static DICTIONARY: Dictionary = Dictionary::new(&CONFIG.settings.dictionary);
 
 pub struct Dictionary {
   map: HashMap<String, Vec<u8>>,

src/lib.rs

@@ -1,5 +1,3 @@
-#[macro_use(lazy_static)]
-extern crate lazy_static;
 #[macro_use]
 extern crate serde_derive;
 extern crate toml;
@@ -14,28 +12,17 @@ mod utils;
 
 use log::LevelFilter;
 use log::{error, info, trace};
-use std::error::Error;
-use winapi::shared::minwindef::{BOOL, DWORD, HINSTANCE, LPVOID, TRUE};
-use winapi::um::winnt::{DLL_PROCESS_ATTACH, DLL_PROCESS_DETACH};
+use static_init::{constructor, destructor};
 
 use crate::config::CONFIG;
 
+#[constructor]
 #[no_mangle]
-pub unsafe extern "system" fn DllMain(
-  _module: HINSTANCE,
-  call_reason: DWORD,
-  _reserved: LPVOID,
-) -> BOOL {
-  crash::install();
-  match call_reason {
-    DLL_PROCESS_ATTACH => attach().is_ok() as BOOL,
-    DLL_PROCESS_DETACH => detach().is_ok() as BOOL,
-    _ => TRUE,
+extern "C" fn attach() {
+  unsafe {
+    crash::install();
   }
-}
-
-fn attach() -> Result<(), Box<dyn Error>> {
-  simple_logging::log_to_file(&CONFIG.settings.log_file, LevelFilter::Trace)?;
+  simple_logging::log_to_file(&CONFIG.settings.log_file, LevelFilter::Trace).unwrap();
   if CONFIG.metadata.name != "dfint localization hook" {
     error!("unable to find config file");
     unsafe {
@@ -51,13 +38,13 @@ fn attach() -> Result<(), Box<dyn Error>> {
   info!("offsets version: {}", CONFIG.offset_metadata.version);
   info!("hook version: {}", CONFIG.hook_version);
   unsafe {
-    hooks::attach_all()?;
+    hooks::attach_all().unwrap();
   }
   trace!("hooks attached");
-  Ok(())
 }
 
-fn detach() -> Result<(), Box<dyn Error>> {
+#[destructor]
+#[no_mangle]
+extern "C" fn detach() {
   trace!("hooks detached");
-  Ok(())
 }

src/utils.rs

@@ -1,10 +1,10 @@
+use static_init::dynamic;
 use std::ptr;
 use winapi::um::libloaderapi::GetModuleHandleW;
 use winapi::um::winuser::MessageBoxW;
 
-lazy_static! {
-  static ref MODULE: usize = unsafe { GetModuleHandleW(ptr::null()) as usize };
-}
+#[dynamic]
+static MODULE: usize = unsafe { GetModuleHandleW(ptr::null()) as usize };
 
 #[allow(dead_code)]
 pub fn address(offset: usize) -> usize {