refactor: Rust 1.70 linting about early Drops

mrjackwills · Jun 23, 2023 · a29ede3 · a29ede3
1 parent 0e1ad2a
commit a29ede3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/src-tauri/src/internal_message_handler/mod.rs b/src-tauri/src/internal_message_handler/mod.rs
@@ -265,9 +265,11 @@ async fn handle_settings(
             }
         }
         SettingChange::Reset => {
-            let sqlite = state.lock().sqlite.clone();
-            let settings = ModelSettings::reset_settings(&sqlite).await?;
-            state.lock().reset_settings(settings);
+			{
+				let sqlite = state.lock().sqlite.clone();
+				let settings = ModelSettings::reset_settings(&sqlite).await?;
+				state.lock().reset_settings(settings);
+			}
             reset_timer(state);
             sx.send(InternalMessage::Emit(Emitter::Settings)).ok();
             sx.send(InternalMessage::Emit(Emitter::Paused)).ok();
@@ -281,8 +283,10 @@ async fn handle_settings(
         }
         SettingChange::SessionLength(value) => {
             if value != settings.session_as_sec {
-                let sqlite = state.lock().sqlite.clone();
-                ModelSettings::update_session(&sqlite, value).await?;
+				{
+					let sqlite = state.lock().sqlite.clone();
+					ModelSettings::update_session(&sqlite, value).await?;
+				}
                 state.lock().set_session_as_sec(value);
                 reset_timer(state);
             }

diff --git a/src-tauri/src/request_handlers/mod.rs b/src-tauri/src/request_handlers/mod.rs
@@ -24,26 +24,14 @@ fn auto_launch() -> Option<AutoLaunch> {
 #[tauri::command]
 #[allow(clippy::needless_pass_by_value)]
 pub fn init(state: TauriState<'_>) {
-    state
-        .lock()
-        .sx
-        .send(InternalMessage::Emit(Emitter::Settings))
-        .ok();
-    state
-        .lock()
-        .sx
-        .send(InternalMessage::Emit(Emitter::NextBreak))
-        .ok();
-    state
-        .lock()
-        .sx
-        .send(InternalMessage::Emit(Emitter::SessionsBeforeLong))
-        .ok();
-    state
-        .lock()
-        .sx
-        .send(InternalMessage::Emit(Emitter::PackageInfo))
-        .ok();
+    for message in [
+        Emitter::Settings,
+        Emitter::NextBreak,
+        Emitter::SessionsBeforeLong,
+        Emitter::PackageInfo,
+    ] {
+        state.lock().sx.send(InternalMessage::Emit(message)).ok();
+    }
     get_autostart(state);
 }