chore: collapse nested if-let statements as it was stabilised in Rust 1.88.0

Author: nekename

plugins/com.amansprojects.starterpack.sdPlugin/src/run_command.rs

@@ -65,11 +65,10 @@ async fn run_command(
 	let mut output = String::new();
 	reader.read_to_string(&mut output)?;
 
-	if let Some(path) = settings.get("file").map(|v| v.as_str().unwrap()) {
-		if !path.is_empty() {
+	if let Some(path) = settings.get("file").map(|v| v.as_str().unwrap())
+		&& !path.is_empty() {
 			tokio::fs::write(path, &output).await?;
 		}
-	}
 
 	if settings
 		.get("show")

src-tauri/src/events/inbound/misc.rs

@@ -21,11 +21,10 @@ pub struct LogMessageEvent {
 }
 
 pub async fn log_message(uuid: Option<&str>, mut event: PayloadEvent<LogMessageEvent>) -> Result<(), anyhow::Error> {
-	if let Some(uuid) = uuid {
-		if let Ok(manifest) = crate::plugins::manifest::read_manifest(&crate::shared::config_dir().join("plugins").join(uuid)) {
+	if let Some(uuid) = uuid
+		&& let Ok(manifest) = crate::plugins::manifest::read_manifest(&crate::shared::config_dir().join("plugins").join(uuid)) {
 			event.payload.message = format!("[{}] {}", manifest.name, event.payload.message);
 		}
-	}
 	log::info!("{}", event.payload.message.trim());
 	Ok(())
 }

src-tauri/src/events/inbound/mod.rs

@@ -133,11 +133,10 @@ pub async fn process_incoming_message(data: Result<Message, Error>, uuid: &str,
 			InboundEventType::SendToPlugin(_) => Ok(()),
 			InboundEventType::SwitchProfile(event) => misc::switch_profile(event).await,
 			InboundEventType::DeviceBrightness(event) => misc::device_brightness(event).await,
-		} {
-			if !error.to_string().contains("closed connection") {
+		}
+			&& !error.to_string().contains("closed connection") {
 				warn!("Failed to process incoming event from plugin: {}", error);
 			}
-		}
 	}
 }
 
@@ -155,11 +154,10 @@ pub async fn process_incoming_message_pi(data: Result<Message, Error>, uuid: &st
 			InboundEventType::GetGlobalSettings(event) => Some(event.context.clone()),
 			InboundEventType::SendToPlugin(event) => Some(event.context.to_string()),
 			_ => None,
-		} {
-			if context != uuid {
+		}
+			&& context != uuid {
 				return;
 			}
-		}
 
 		if let Err(error) = match decoded {
 			InboundEventType::SetSettings(event) => settings::set_settings(event, true).await,
@@ -170,10 +168,9 @@ pub async fn process_incoming_message_pi(data: Result<Message, Error>, uuid: &st
 			InboundEventType::LogMessage(event) => misc::log_message(None, event).await,
 			InboundEventType::SendToPlugin(event) => property_inspector::send_to_plugin(event).await,
 			_ => Ok(()),
-		} {
-			if !error.to_string().contains("closed connection") {
+		}
+			&& !error.to_string().contains("closed connection") {
 				warn!("Failed to process incoming event from property inspector: {}", error);
 			}
-		}
 	}
 }

src-tauri/src/events/outbound/will_appear.rs

@@ -42,11 +42,10 @@ pub async fn will_disappear(instance: &ActionInstance, clear_on_device: bool) ->
 	)
 	.await?;
 
-	if clear_on_device {
-		if let Err(error) = crate::events::outbound::devices::update_image((&instance.context).into(), None).await {
+	if clear_on_device
+		&& let Err(error) = crate::events::outbound::devices::update_image((&instance.context).into(), None).await {
 			log::warn!("Failed to clear device image: {}", error);
 		}
-	}
 
 	Ok(())
 }

src-tauri/src/plugins/manifest.rs

@@ -79,11 +79,10 @@ pub fn read_manifest(base_path: &std::path::Path) -> Result<PluginManifest, anyh
 	.context("failed to parse manifest")?;
 
 	let platform_overrides_path = base_path.join(format!("manifest.{}.json", std::env::consts::OS));
-	if platform_overrides_path.exists() {
-		if let Ok(Ok(platform_overrides)) = std::fs::read(platform_overrides_path).map(|v| serde_json::from_slice(&v)) {
+	if platform_overrides_path.exists()
+		&& let Ok(Ok(platform_overrides)) = std::fs::read(platform_overrides_path).map(|v| serde_json::from_slice(&v)) {
 			json_patch::merge(&mut manifest, &platform_overrides);
 		}
-	}
 
 	serde_json::from_value(manifest).context("failed to parse manifest")
 }

src-tauri/src/plugins/mod.rs

@@ -176,12 +176,11 @@ pub async fn initialise_plugin(path: &path::Path) -> anyhow::Result<()> {
 			.visible(false)
 			.build()?;
 
-		if let Ok(store) = get_settings() {
-			if store.value.developer {
+		if let Ok(store) = get_settings()
+			&& store.value.developer {
 				let _ = window.show();
 				window.open_devtools();
 			}
-		}
 
 		let info = info_param::make_info(plugin_uuid.to_owned(), manifest.version, false).await;
 		window.eval(format!(
@@ -319,11 +318,10 @@ pub async fn initialise_plugin(path: &path::Path) -> anyhow::Result<()> {
 		}
 	}
 
-	if let Some(applications) = manifest.applications_to_monitor {
-		if let Some(applications) = applications.get(platform) {
+	if let Some(applications) = manifest.applications_to_monitor
+		&& let Some(applications) = applications.get(platform) {
 			crate::application_watcher::start_monitoring(plugin_uuid, applications).await;
 		}
-	}
 
 	Ok(())
 }

src-tauri/src/zip_extract.rs

@@ -88,11 +88,10 @@ pub fn extract<S: Read + Seek>(source: S, target_dir: &Path) -> Result<(), ZipEx
 		if name.ends_with('/') {
 			fs::create_dir_all(&outpath)?;
 		} else {
-			if let Some(p) = outpath.parent() {
-				if !p.exists() {
+			if let Some(p) = outpath.parent()
+				&& !p.exists() {
 					fs::create_dir_all(p)?;
 				}
-			}
 			let mut outfile = fs::File::create(&outpath)?;
 			io::copy(&mut file, &mut outfile)?;
 		}