fix: fmt and clippy

tauri-apps · Jun 4, 2024 · 9c0b649 · 9c0b649
1 parent e2d0a34
commit 9c0b649
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 12 deletions.
diff --git a/tooling/bundler/src/bundle/linux/debian.rs b/tooling/bundler/src/bundle/linux/debian.rs
@@ -180,15 +180,30 @@ fn generate_control_file(
   if !dependencies.is_empty() {
     writeln!(file, "Depends: {}", dependencies.join(", "))?;
   }
-  let provides = settings.deb().provides.as_ref().cloned().unwrap_or_default();
+  let provides = settings
+    .deb()
+    .provides
+    .as_ref()
+    .cloned()
+    .unwrap_or_default();
   if !provides.is_empty() {
     writeln!(file, "Provides: {}", provides.join(", "))?;
   }
-  let conflicts = settings.deb().conflicts.as_ref().cloned().unwrap_or_default();
+  let conflicts = settings
+    .deb()
+    .conflicts
+    .as_ref()
+    .cloned()
+    .unwrap_or_default();
   if !conflicts.is_empty() {
     writeln!(file, "Conflicts: {}", conflicts.join(", "))?;
   }
-  let replaces = settings.deb().replaces.as_ref().cloned().unwrap_or_default();
+  let replaces = settings
+    .deb()
+    .replaces
+    .as_ref()
+    .cloned()
+    .unwrap_or_default();
   if !replaces.is_empty() {
     writeln!(file, "Replaces: {}", replaces.join(", "))?;
   }

diff --git a/tooling/bundler/src/bundle/linux/rpm.rs b/tooling/bundler/src/bundle/linux/rpm.rs
@@ -67,16 +67,34 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     builder = builder.requires(Dependency::any(dep));
   }
   // Add provides
-  for dep in settings.rpm().provides.as_ref().cloned().unwrap_or_default() {
+  for dep in settings
+    .rpm()
+    .provides
+    .as_ref()
+    .cloned()
+    .unwrap_or_default()
+  {
     builder = builder.provides(Dependency::any(dep));
   }
   // Add conflicts
-  for dep in settings.rpm().conflicts.as_ref().cloned().unwrap_or_default() {
+  for dep in settings
+    .rpm()
+    .conflicts
+    .as_ref()
+    .cloned()
+    .unwrap_or_default()
+  {
     builder = builder.conflicts(Dependency::any(dep));
   }
 
   // Add obsoletes
-  for dep in settings.rpm().obsoletes.as_ref().cloned().unwrap_or_default() {
+  for dep in settings
+    .rpm()
+    .obsoletes
+    .as_ref()
+    .cloned()
+    .unwrap_or_default()
+  {
     builder = builder.obsoletes(Dependency::any(dep));
   }
 

diff --git a/tooling/cli/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs
@@ -1145,9 +1145,9 @@ fn tauri_config_to_bundle_settings(
       } else {
         Some(depends_deb)
       },
-      provides: config.linux.deb.provides,
-      conflicts: config.linux.deb.conflicts,
-      replaces: config.linux.deb.replaces,
+      provides: config.deb.provides,
+      conflicts: config.deb.conflicts,
+      replaces: config.deb.replaces,
       files: config.deb.files,
       desktop_template: config.deb.desktop_template,
       section: config.deb.section,
@@ -1161,9 +1161,9 @@ fn tauri_config_to_bundle_settings(
       } else {
         Some(depends_rpm)
       },
-      provides: config.linux.rpm.provides,
-      conflicts: config.linux.rpm.conflicts,
-      obsoletes: config.linux.rpm.obsoletes,
+      provides: config.rpm.provides,
+      conflicts: config.rpm.conflicts,
+      obsoletes: config.rpm.obsoletes,
       release: config.rpm.release,
       epoch: config.rpm.epoch,
       files: config.rpm.files,