Require Rust v1.84

Author: uklotzde

Cargo.toml

@@ -6,11 +6,13 @@
 
 [workspace]
 members = [".", "crates/*", "file-collection-app/", "websrv/"]
+# Enforce MSRV-aware package resolver.
+resolver = "3"
 
 [workspace.package]
 version = "0.8.0"
 edition = "2021"
-rust-version = "1.82"
+rust-version = "1.84"
 repository = "https://gitlab.com/uklotzde/aoide-rs"
 license = "AGPL-3.0-or-later"
 categories = ["multimedia::audio"]

crates/core/src/collection/mod.rs

@@ -71,7 +71,7 @@ impl Validate for Collection {
         ValidationContext::new()
             .invalidate_if(title.trim().is_empty(), Self::Invalidity::TitleEmpty)
             .invalidate_if(
-                kind.as_ref().map_or(false, |kind| kind.trim().is_empty()),
+                kind.as_ref().is_some_and(|kind| kind.trim().is_empty()),
                 Self::Invalidity::KindEmpty,
             )
             .validate_with(color, Self::Invalidity::Color)

crates/core/src/media/content/mod.rs

@@ -531,7 +531,7 @@ impl Validate for AudioContentMetadata {
                 self.encoder
                     .as_deref()
                     .map(str::trim)
-                    .map_or(false, str::is_empty),
+                    .is_some_and(str::is_empty),
                 Self::Invalidity::EncoderEmpty,
             )
             .into()

crates/core/src/music/key/mod.rs

@@ -808,7 +808,7 @@ impl OpenKeySignature {
     #[must_use]
     #[allow(clippy::missing_panics_doc)] // Never panics
     #[allow(clippy::similar_names)] // False positive
-    pub fn new(code: KeyCodeValue, mode: KeyMode) -> Self {
+    pub const fn new(code: KeyCodeValue, mode: KeyMode) -> Self {
         #[allow(clippy::missing_panics_doc)] // Never panics
         let code = KeyCode::try_from_value(
             2 * code
@@ -864,7 +864,7 @@ impl LancelotKeySignature {
     #[must_use]
     #[allow(clippy::missing_panics_doc)] // Never panics
     #[allow(clippy::similar_names)] // False positive
-    pub fn new(code: KeyCodeValue, mode: KeyMode) -> Self {
+    pub const fn new(code: KeyCodeValue, mode: KeyMode) -> Self {
         let code = KeyCode::try_from_value(
             ((code * 2 + 9) % 24)
                 + match mode {
@@ -918,7 +918,7 @@ impl EngineKeySignature {
 
     #[must_use]
     #[allow(clippy::missing_panics_doc)] // Never panics
-    pub fn from_code(code: KeyCodeValue) -> Self {
+    pub const fn from_code(code: KeyCodeValue) -> Self {
         let code = KeyCode::try_from_value(code % 24 + 1).expect("valid key code");
         Self(KeySignature::new(code))
     }

crates/core/src/playlist/mod.rs

@@ -114,9 +114,7 @@ impl Validate for Entry {
         let Self { title, item, .. } = self;
         ValidationContext::new()
             .invalidate_if(
-                title
-                    .as_ref()
-                    .map_or(false, |title| title.trim().is_empty()),
+                title.as_ref().is_some_and(|title| title.trim().is_empty()),
                 Self::Invalidity::TitleEmpty,
             )
             .validate_with(item, Self::Invalidity::Item)
@@ -198,7 +196,7 @@ impl Validate for Playlist {
         ValidationContext::new()
             .invalidate_if(title.trim().is_empty(), Self::Invalidity::TitleEmpty)
             .invalidate_if(
-                kind.as_ref().map_or(false, |kind| kind.trim().is_empty()),
+                kind.as_ref().is_some_and(|kind| kind.trim().is_empty()),
                 Self::Invalidity::KindEmpty,
             )
             .validate_with(color, Self::Invalidity::Color)

crates/media-file/src/fs/visit/mod.rs

@@ -24,7 +24,7 @@ fn is_hidden_dir_entry(dir_entry: &DirEntry) -> bool {
         return dir_entry
             .file_name()
             .to_str()
-            .map_or(false, |dir_name| HIDDEN_DIR_NAMES.contains(&dir_name));
+            .is_some_and(|dir_name| HIDDEN_DIR_NAMES.contains(&dir_name));
     }
     false
 }

websrv/src/launcher/ui.rs

@@ -348,11 +348,11 @@ impl App {
 }
 
 fn is_existing_directory(path: &Path) -> bool {
-    path.canonicalize().map_or(false, |p| p.is_dir())
+    path.canonicalize().as_deref().is_ok_and(Path::is_dir)
 }
 
 fn is_existing_file(path: &Path) -> bool {
-    path.canonicalize().map_or(false, |p| p.is_file())
+    path.canonicalize().as_deref().is_ok_and(Path::is_file)
 }
 
 impl eframe::App for App {