Move statics to local scope

Author: Earthcomputer

src/config.rs

@@ -6,9 +6,8 @@ use serenity::model::id::{ChannelId, GuildId, RoleId};
 use std::fs::File;
 use std::sync::{Arc, OnceLock, RwLock};
 
-static CONFIG: OnceLock<RwLock<Arc<Config>>> = OnceLock::new();
-
 fn writable_config() -> &'static RwLock<Arc<Config>> {
+    static CONFIG: OnceLock<RwLock<Arc<Config>>> = OnceLock::new();
     CONFIG.get_or_init(|| RwLock::new(Arc::new(Config::load().unwrap())))
 }
 

src/discord_bot/guild_storage.rs

@@ -13,8 +13,8 @@ use std::collections::{HashMap, HashSet};
 use std::ops::{Deref, DerefMut};
 use std::sync::OnceLock;
 
-static GUILD_STORAGE: OnceLock<DashMap<GuildId, GuildStorage>> = OnceLock::new();
 fn guild_storage() -> &'static DashMap<GuildId, GuildStorage> {
+    static GUILD_STORAGE: OnceLock<DashMap<GuildId, GuildStorage>> = OnceLock::new();
     GUILD_STORAGE.get_or_init(DashMap::new)
 }
 

src/discord_bot/simple_words.rs

@@ -5,8 +5,8 @@ use serenity::model::user::User;
 use std::collections::HashSet;
 use std::sync::OnceLock;
 
-static TOP_10K_WORDS: OnceLock<HashSet<&'static str>> = OnceLock::new();
 fn top_10k_words() -> &'static HashSet<&'static str> {
+    static TOP_10K_WORDS: OnceLock<HashSet<&'static str>> = OnceLock::new();
     TOP_10K_WORDS.get_or_init(|| {
         let mut set = HashSet::with_capacity(5000);
         for word in include!("simple_writer_words.txt") {

src/discord_bot/update_copy.rs

@@ -11,8 +11,8 @@ use std::sync::OnceLock;
 use std::time::Duration;
 use tokio::sync::Mutex;
 
-static COPY_UPDATE_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
 fn copy_update_mutex() -> &'static Mutex<()> {
+    static COPY_UPDATE_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
     COPY_UPDATE_MUTEX.get_or_init(|| Mutex::new(()))
 }
 

src/main.rs

@@ -51,8 +51,8 @@ pub struct ProtobotData {
 }
 
 static IS_SHUTDOWN: AtomicBool = AtomicBool::new(false);
-static SHUTDOWN_SEMAPHORE: OnceLock<Semaphore> = OnceLock::new();
 fn shutdown_semaphore() -> &'static Semaphore {
+    static SHUTDOWN_SEMAPHORE: OnceLock<Semaphore> = OnceLock::new();
     SHUTDOWN_SEMAPHORE.get_or_init(|| Semaphore::new(0))
 }