chore: bump rust toolchain to nightly-2025-02-21 (#737)

vnghia · Feb 22, 2025 · 7a1c5bb · 7a1c5bb
1 parent 977bcff
commit 7a1c5bb
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 145 deletions.
diff --git a/nghe-backend/src/file/audio/date.rs b/nghe-backend/src/file/audio/date.rs
@@ -84,7 +84,7 @@ impl TryFrom<&lofty::tag::items::Timestamp> for Date {
 #[cfg(test)]
 #[coverage(off)]
 mod test {
-    use std::fmt::{Display, Formatter};
+    use std::fmt::{Display, Formatter, Write};
 
     use fake::{Dummy, Fake, Faker};
 
@@ -96,9 +96,9 @@ mod test {
                 let mut result = format!("{year:04}");
                 if let Some(month) = self.month {
                     let month = month as u8;
-                    result += &format!("-{month:02}");
+                    write!(result, "-{month:02}")?;
                     if let Some(day) = self.day {
-                        result += &format!("-{day:02}");
+                        write!(result, "-{day:02}")?;
                     }
                 }
                 write!(f, "{result}")

diff --git a/nghe-backend/src/file/audio/mod.rs b/nghe-backend/src/file/audio/mod.rs
@@ -175,34 +175,42 @@ mod tests {
         assert_eq!(main.original_release_date, Date::default());
         assert_eq!(main.mbz_id, None);
 
-        assert_eq!(song.track_disc, TrackDisc {
-            track: Position { number: Some(10), total: None },
-            disc: Position { number: Some(5), total: Some(10) }
-        });
+        assert_eq!(
+            song.track_disc,
+            TrackDisc {
+                track: Position { number: Some(10), total: None },
+                disc: Position { number: Some(5), total: Some(10) }
+            }
+        );
 
         assert_eq!(song.languages, &[Language::Eng, Language::Vie]);
 
         let album = metadata.album;
         assert_eq!(album.name, "Album");
-        assert_eq!(album.date, Date {
-            year: Some(2000),
-            month: Some(Month::December),
-            day: Some(31.try_into().unwrap())
-        });
+        assert_eq!(
+            album.date,
+            Date {
+                year: Some(2000),
+                month: Some(Month::December),
+                day: Some(31.try_into().unwrap())
+            }
+        );
         assert_eq!(album.release_date, Date::default());
-        assert_eq!(album.original_release_date, Date {
-            year: Some(3000),
-            month: Some(Month::January),
-            day: None
-        });
+        assert_eq!(
+            album.original_release_date,
+            Date { year: Some(3000), month: Some(Month::January), day: None }
+        );
         assert_eq!(album.mbz_id, None);
 
         let artists = metadata.artists;
         let song = artists.song;
-        assert_eq!(song.into_iter().collect::<Vec<_>>(), &[
-            ("Artist1", uuid::uuid!("1ffedd2d-f63d-4dc2-9332-d3132e5134ac")).into(),
-            Artist::from("Artist2")
-        ]);
+        assert_eq!(
+            song.into_iter().collect::<Vec<_>>(),
+            &[
+                ("Artist1", uuid::uuid!("1ffedd2d-f63d-4dc2-9332-d3132e5134ac")).into(),
+                Artist::from("Artist2")
+            ]
+        );
         let album = artists.album;
         assert_eq!(album.into_iter().collect::<Vec<_>>(), &["Artist1", "Artist3"]);
         assert!(artists.compilation);

diff --git a/nghe-backend/src/file/picture/mod.rs b/nghe-backend/src/file/picture/mod.rs
@@ -241,10 +241,13 @@ mod test {
                 (100..=200).fake_with_rng(rng),
                 |_, _| Rgb::from(Faker.fake_with_rng::<[u8; 3], _>(rng)),
             )
-            .write_to(&mut cursor, match format {
-                Format::Png => ImageFormat::Png,
-                Format::Jpeg => ImageFormat::Jpeg,
-            })
+            .write_to(
+                &mut cursor,
+                match format {
+                    Format::Png => ImageFormat::Png,
+                    Format::Jpeg => ImageFormat::Jpeg,
+                },
+            )
             .unwrap();
             cursor.set_position(0);
 

diff --git a/nghe-backend/src/integration/informant.rs b/nghe-backend/src/integration/informant.rs
@@ -308,11 +308,15 @@ mod tests {
         let id_mltr = audio::Artist::from("Micheal Learns To Rock").upsert_mock(&mock).await;
 
         mock.informant
-            .fetch_and_upsert_artist(mock.database(), &mock.config.cover_art, &Request {
-                artist_id: id_mltr,
-                spotify_id: Some("7zMVPOJPs5jgU8NorRxqJe".to_owned()),
-                lastfm_name: Some("Michael Learns to Rock".to_owned()),
-            })
+            .fetch_and_upsert_artist(
+                mock.database(),
+                &mock.config.cover_art,
+                &Request {
+                    artist_id: id_mltr,
+                    spotify_id: Some("7zMVPOJPs5jgU8NorRxqJe".to_owned()),
+                    lastfm_name: Some("Michael Learns to Rock".to_owned()),
+                },
+            )
             .await
             .unwrap();
 

diff --git a/nghe-backend/src/lib.rs b/nghe-backend/src/lib.rs
@@ -4,9 +4,7 @@
 #![feature(coverage_attribute)]
 #![feature(duration_constructors)]
 #![feature(if_let_guard)]
-#![feature(integer_sign_cast)]
 #![feature(iterator_try_collect)]
-#![feature(file_lock)]
 #![feature(let_chains)]
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]

diff --git a/nghe-backend/src/orm/playlist/full.rs b/nghe-backend/src/orm/playlist/full.rs
@@ -84,10 +84,14 @@ mod tests {
         music_folder.add_audio().n_song(n_song).call().await;
 
         let user_id = mock.user_id(0).await;
-        create_playlist::handler(mock.database(), user_id, create_playlist::Request {
-            create_or_update: Faker.fake::<String>().into(),
-            song_ids: Some(music_folder.database.keys().copied().collect()),
-        })
+        create_playlist::handler(
+            mock.database(),
+            user_id,
+            create_playlist::Request {
+                create_or_update: Faker.fake::<String>().into(),
+                song_ids: Some(music_folder.database.keys().copied().collect()),
+            },
+        )
         .await
         .unwrap();
 

diff --git a/nghe-backend/src/orm/playlist/mod.rs b/nghe-backend/src/orm/playlist/mod.rs
@@ -94,10 +94,14 @@ mod tests {
         music_folder.add_audio().n_song(n_song).call().await;
 
         let user_id = mock.user_id(0).await;
-        create_playlist::handler(mock.database(), user_id, create_playlist::Request {
-            create_or_update: Faker.fake::<String>().into(),
-            song_ids: Some(music_folder.database.keys().copied().collect()),
-        })
+        create_playlist::handler(
+            mock.database(),
+            user_id,
+            create_playlist::Request {
+                create_or_update: Faker.fake::<String>().into(),
+                song_ids: Some(music_folder.database.keys().copied().collect()),
+            },
+        )
         .await
         .unwrap();
 

diff --git a/nghe-backend/src/orm/playlist/short.rs b/nghe-backend/src/orm/playlist/short.rs
@@ -67,10 +67,14 @@ mod tests {
         music_folder.add_audio().n_song(n_song).call().await;
 
         let user_id = mock.user_id(0).await;
-        create_playlist::handler(mock.database(), user_id, create_playlist::Request {
-            create_or_update: Faker.fake::<String>().into(),
-            song_ids: Some(music_folder.database.keys().copied().collect()),
-        })
+        create_playlist::handler(
+            mock.database(),
+            user_id,
+            create_playlist::Request {
+                create_or_update: Faker.fake::<String>().into(),
+                song_ids: Some(music_folder.database.keys().copied().collect()),
+            },
+        )
         .await
         .unwrap();
 

diff --git a/nghe-backend/src/route/bookmarks/get_playqueue.rs b/nghe-backend/src/route/bookmarks/get_playqueue.rs
@@ -80,11 +80,11 @@ mod test {
 
         let user_id = mock.user_id(0).await;
 
-        save_playqueue::handler(mock.database(), user_id, save_playqueue::Request {
-            ids: song_ids,
-            position: None,
-            current: None,
-        })
+        save_playqueue::handler(
+            mock.database(),
+            user_id,
+            save_playqueue::Request { ids: song_ids, position: None, current: None },
+        )
         .await
         .unwrap();
 

diff --git a/nghe-backend/src/route/browsing/get_artists.rs b/nghe-backend/src/route/browsing/get_artists.rs
@@ -98,9 +98,13 @@ mod tests {
         let user_id = mock.user_id(0).await;
         let with_user_id =
             handler(mock.database(), user_id, Request { music_folder_ids: None }).await.unwrap();
-        let with_music_folder = handler(mock.database(), user_id, Request {
-            music_folder_ids: Some(vec![music_folder_deny.id(), music_folder_allow.id()]),
-        })
+        let with_music_folder = handler(
+            mock.database(),
+            user_id,
+            Request {
+                music_folder_ids: Some(vec![music_folder_deny.id(), music_folder_allow.id()]),
+            },
+        )
         .await
         .unwrap();
         assert_eq!(with_user_id, with_music_folder);

diff --git a/nghe-backend/src/route/lists/get_starred2.rs b/nghe-backend/src/route/lists/get_starred2.rs
@@ -68,10 +68,11 @@ mod tests {
         let artist_id = artist.upsert_mock(&mock).await;
         music_folder.add_audio_artist([artist.clone()], [], false, 1).await;
 
-        star::handler(mock.database(), user_id_star, star::Request {
-            artist_ids: Some(vec![artist_id]),
-            ..Default::default()
-        })
+        star::handler(
+            mock.database(),
+            user_id_star,
+            star::Request { artist_ids: Some(vec![artist_id]), ..Default::default() },
+        )
         .await
         .unwrap();
 
@@ -145,10 +146,11 @@ mod tests {
             .call()
             .await;
 
-        star::handler(mock.database(), user_id_star, star::Request {
-            album_ids: Some(vec![album_id]),
-            ..Default::default()
-        })
+        star::handler(
+            mock.database(),
+            user_id_star,
+            star::Request { album_ids: Some(vec![album_id]), ..Default::default() },
+        )
         .await
         .unwrap();
 
@@ -157,9 +159,10 @@ mod tests {
                 handler(database, user_id_star, Request::default()).await.unwrap().starred2;
             assert!(starred.song.is_empty());
             assert!(starred.artist.is_empty());
-            assert_eq!(starred.album.into_iter().map(|album| album.id).collect::<Vec<_>>(), vec![
-                album_id
-            ]);
+            assert_eq!(
+                starred.album.into_iter().map(|album| album.id).collect::<Vec<_>>(),
+                vec![album_id]
+            );
 
             let albums: Vec<_> =
                 get_artist::handler(database, user_id_star, get_artist::Request { id: artist_id })
@@ -209,10 +212,11 @@ mod tests {
         music_folder.add_audio().album(album).call().await;
         let song_id = *music_folder.database.get_index(0).unwrap().0;
 
-        star::handler(mock.database(), user_id_star, star::Request {
-            song_ids: Some(vec![song_id]),
-            ..Default::default()
-        })
+        star::handler(
+            mock.database(),
+            user_id_star,
+            star::Request { song_ids: Some(vec![song_id]), ..Default::default() },
+        )
         .await
         .unwrap();
 

diff --git a/nghe-backend/src/route/media_annotation/scrobble.rs b/nghe-backend/src/route/media_annotation/scrobble.rs
@@ -86,11 +86,11 @@ mod tests {
                 Some(times.clone())
             };
 
-            let result = handler(mock.database(), user_id, Request {
-                ids: ids.clone(),
-                times,
-                submission: None,
-            })
+            let result = handler(
+                mock.database(),
+                user_id,
+                Request { ids: ids.clone(), times, submission: None },
+            )
             .await;
             assert_eq!(result.is_ok(), i < n_play - 1 || n_song >= n_time);
         }

diff --git a/nghe-backend/src/route/media_retrieval/stream.rs b/nghe-backend/src/route/media_retrieval/stream.rs
@@ -209,10 +209,10 @@ mod tests {
             assert_eq!(status, StatusCode::OK);
             assert_eq!(transcoded, body);
         }
-        assert_eq!(transcode_status, &[
-            TranscodeStatus::ServeCachedOutput,
-            TranscodeStatus::ServeCachedOutput
-        ]);
+        assert_eq!(
+            transcode_status,
+            &[TranscodeStatus::ServeCachedOutput, TranscodeStatus::ServeCachedOutput]
+        );
     }
 
     #[rstest]
@@ -277,9 +277,9 @@ mod tests {
             assert_eq!(status, StatusCode::OK);
             assert!(!body.is_empty());
         }
-        assert_eq!(transcode_status, &[
-            TranscodeStatus::UseCachedOutput,
-            TranscodeStatus::UseCachedOutput
-        ]);
+        assert_eq!(
+            transcode_status,
+            &[TranscodeStatus::UseCachedOutput, TranscodeStatus::UseCachedOutput]
+        );
     }
 }
diff --git a/nghe-backend/src/route/music_folder/add.rs b/nghe-backend/src/route/music_folder/add.rs
@@ -23,10 +23,10 @@ async fn handler_impl(
         .await?;
 
     if request.allow {
-        permission::add::handler(database, permission::add::Request {
-            user_id: None,
-            music_folder_id: Some(music_folder_id),
-        })
+        permission::add::handler(
+            database,
+            permission::add::Request { user_id: None, music_folder_id: Some(music_folder_id) },
+        )
         .await?;
     }
 

diff --git a/nghe-backend/src/route/playlists/create_playlist.rs b/nghe-backend/src/route/playlists/create_playlist.rs
@@ -39,9 +39,11 @@ pub async fn handler(
     }
 
     Ok(Response {
-        playlist: get_playlist::handler(database, user_id, get_playlist::Request {
-            id: playlist_id,
-        })
+        playlist: get_playlist::handler(
+            database,
+            user_id,
+            get_playlist::Request { id: playlist_id },
+        )
         .await?
         .playlist,
     })

diff --git a/nghe-backend/src/route/playlists/get_playlist.rs b/nghe-backend/src/route/playlists/get_playlist.rs
@@ -95,10 +95,14 @@ mod tests {
                 let user_id = mock.user_id(i).await;
                 (
                     user_id,
-                    create_playlist::handler(mock.database(), user_id, create_playlist::Request {
-                        create_or_update: Faker.fake::<String>().into(),
-                        song_ids: Some(song_ids.clone()),
-                    })
+                    create_playlist::handler(
+                        mock.database(),
+                        user_id,
+                        create_playlist::Request {
+                            create_or_update: Faker.fake::<String>().into(),
+                            song_ids: Some(song_ids.clone()),
+                        },
+                    )
                     .await
                     .unwrap()
                     .playlist