#262: Fix lints for Rust 1.72

mtkennerly · Aug 25, 2023 · a3b0355 · a3b0355
1 parent 3ebf8cf
commit a3b0355
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/src/cloud.rs b/src/cloud.rs
@@ -11,7 +11,9 @@ pub fn validate_cloud_config(config: &Config, cloud_path: &str) -> Result<Remote
     if !config.apps.rclone.is_valid() {
         return Err(Error::RcloneUnavailable);
     }
-    let Some(remote) = config.cloud.remote.clone() else { return Err(Error::CloudNotConfigured) };
+    let Some(remote) = config.cloud.remote.clone() else {
+        return Err(Error::CloudNotConfigured);
+    };
     validate_cloud_path(cloud_path)?;
     Ok(remote)
 }

diff --git a/src/gui/game_list.rs b/src/gui/game_list.rs
@@ -727,7 +727,9 @@ impl GameList {
     pub fn set_comment(&mut self, game: &str, comment: String) {
         let Some(index) = self.find_game(game) else { return };
         let entry = &mut self.entries[index];
-        let Some(backup) = &mut entry.scan_info.backup else { return };
+        let Some(backup) = &mut entry.scan_info.backup else {
+            return;
+        };
         let Some(layout) = &mut entry.game_layout else { return };
 
         layout.set_backup_comment(backup.name(), &comment);
@@ -738,7 +740,9 @@ impl GameList {
     pub fn toggle_locked(&mut self, game: &str) {
         let Some(index) = self.find_game(game) else { return };
         let entry = &mut self.entries[index];
-        let Some(backup) = &mut entry.scan_info.backup else { return };
+        let Some(backup) = &mut entry.scan_info.backup else {
+            return;
+        };
         let Some(layout) = &mut entry.game_layout else { return };
 
         let new = !backup.locked();

diff --git a/src/lang.rs b/src/lang.rs
@@ -206,9 +206,9 @@ fn set_language(language: Language) {
     *last_language = language;
 }
 
-static RE_EXTRA_SPACES: Lazy<Regex> = Lazy::new(|| Regex::new(r#"([^\r\n ]) {2,}"#).unwrap());
-static RE_EXTRA_LINES: Lazy<Regex> = Lazy::new(|| Regex::new(r#"([^\r\n ])[\r\n]([^\r\n ])"#).unwrap());
-static RE_EXTRA_PARAGRAPHS: Lazy<Regex> = Lazy::new(|| Regex::new(r#"([^\r\n ])[\r\n]{2,}([^\r\n ])"#).unwrap());
+static RE_EXTRA_SPACES: Lazy<Regex> = Lazy::new(|| Regex::new(r"([^\r\n ]) {2,}").unwrap());
+static RE_EXTRA_LINES: Lazy<Regex> = Lazy::new(|| Regex::new(r"([^\r\n ])[\r\n]([^\r\n ])").unwrap());
+static RE_EXTRA_PARAGRAPHS: Lazy<Regex> = Lazy::new(|| Regex::new(r"([^\r\n ])[\r\n]{2,}([^\r\n ])").unwrap());
 
 fn translate(id: &str) -> String {
     translate_args(id, &FluentArgs::new())

diff --git a/src/scan/launchers/generic.rs b/src/scan/launchers/generic.rs
@@ -142,7 +142,9 @@ pub fn scan(root: &RootsConfig, manifest: &Manifest, subjects: &[String]) -> Has
     subjects
         .iter()
         .filter_map(|name| {
-            let Some((score, subdir)) = by_title.get(name) else { return None };
+            let Some((score, subdir)) = by_title.get(name) else {
+                return None;
+            };
 
             if *score < i64::MAX {
                 if let Some(competitors) = by_subdir.get(subdir) {

diff --git a/src/scan/layout.rs b/src/scan/layout.rs
@@ -1613,7 +1613,9 @@ impl GameLayout {
             if let Err(e) = match &file.container {
                 None => self.restore_file_from_simple(target, file),
                 Some(container) => {
-                    let Some(archive) = containers.get_mut(container) else { continue };
+                    let Some(archive) = containers.get_mut(container) else {
+                        continue;
+                    };
                     self.restore_file_from_zip(target, file, archive)
                 }
             } {
@@ -1857,8 +1859,12 @@ impl GameLayout {
                     }
                 }
                 BackupFormat::Zip => {
-                    let Ok(handle) = std::fs::File::open(self.path.joined(&backup.name).interpret()) else { return false };
-                    let Ok(mut archive) = zip::ZipArchive::new(handle) else { return false };
+                    let Ok(handle) = std::fs::File::open(self.path.joined(&backup.name).interpret()) else {
+                        return false;
+                    };
+                    let Ok(mut archive) = zip::ZipArchive::new(handle) else {
+                        return false;
+                    };
 
                     for file in backup.files.keys() {
                         let original_path = StrictPath::new(file.to_string());
@@ -1893,8 +1899,12 @@ impl GameLayout {
                         }
                     }
                     BackupFormat::Zip => {
-                        let Ok(handle) = std::fs::File::open(self.path.joined(&backup.name).interpret()) else { return false };
-                        let Ok(mut archive) = zip::ZipArchive::new(handle) else { return false };
+                        let Ok(handle) = std::fs::File::open(self.path.joined(&backup.name).interpret()) else {
+                            return false;
+                        };
+                        let Ok(mut archive) = zip::ZipArchive::new(handle) else {
+                            return false;
+                        };
 
                         for (file, data) in &backup.files {
                             if data.is_none() {

diff --git a/src/scan/title.rs b/src/scan/title.rs
@@ -15,7 +15,7 @@ static RE_EDITION_KNOWN: Lazy<Regex> = Lazy::new(|| Regex::new(r#" (game of the
 /// This covers any single-word editions that are not separated by punctuation.
 /// We can't assume more than one word because it may be part of the main title.
 static RE_EDITION_SHORT: Lazy<Regex> = Lazy::new(|| Regex::new(r#" [^ ]+ edition$"#).unwrap());
-static RE_YEAR_SUFFIX: Lazy<Regex> = Lazy::new(|| Regex::new(r#" \(\d+\)$"#).unwrap());
+static RE_YEAR_SUFFIX: Lazy<Regex> = Lazy::new(|| Regex::new(r" \(\d+\)$").unwrap());
 static RE_SYMBOLS: Lazy<Regex> = Lazy::new(|| Regex::new(r#"[™®©:-]"#).unwrap());
 static RE_SPACES: Lazy<Regex> = Lazy::new(|| Regex::new(r#" {2,}"#).unwrap());