diff --git a/.gitea/images/Dockerfile b/.gitea/images/Dockerfile index fa70c4b..1a96a58 100644 --- a/.gitea/images/Dockerfile +++ b/.gitea/images/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/rust:1.80 +FROM docker.io/library/rust:1.83 RUN rustup component add \ clippy \ diff --git a/.gitea/workflows/gitea-ci.yaml b/.gitea/workflows/gitea-ci.yaml index d540eb1..4df9bd6 100644 --- a/.gitea/workflows/gitea-ci.yaml +++ b/.gitea/workflows/gitea-ci.yaml @@ -7,13 +7,14 @@ on: branches: [ main ] env: + CI_CONTAINER: docker.io/drrobot/musichoard-ci:20241230-1 CARGO_TERM_COLOR: always CARGO_TERM_VERBOSE: true jobs: build_and_test: name: Build and Test - container: docker.io/drrobot/musichoard-ci:20240824-1 + container: ${{ env.CI_CONTAINER }} env: BEETSDIR: ./ LLVM_PROFILE_FILE: target/debug/profraw/musichoard-%p-%m.profraw @@ -48,7 +49,7 @@ jobs: lint: name: Lint - container: docker.io/drrobot/musichoard-ci:20240824-1 + container: ${{ env.CI_CONTAINER }} steps: - uses: actions/checkout@v3 - run: cargo clippy --no-default-features --all-targets -- -D warnings diff --git a/src/external/database/serde/deserialize.rs b/src/external/database/serde/deserialize.rs index acfed8a..e0ad951 100644 --- a/src/external/database/serde/deserialize.rs +++ b/src/external/database/serde/deserialize.rs @@ -82,7 +82,7 @@ impl From for Mbid { struct DeserializeMbidVisitor; -impl<'de> Visitor<'de> for DeserializeMbidVisitor { +impl Visitor<'_> for DeserializeMbidVisitor { type Value = DeserializeMbid; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/src/external/database/serde/serialize.rs b/src/external/database/serde/serialize.rs index d7e8762..bc50ce3 100644 --- a/src/external/database/serde/serialize.rs +++ b/src/external/database/serde/serialize.rs @@ -59,7 +59,7 @@ impl<'a, T: IMusicBrainzRef> From<&'a MbRefOption> for SerializeMbRefOption<' } } -impl<'a> Serialize for SerializeMbid<'a> { +impl Serialize for SerializeMbid<'_> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, diff --git a/src/external/musicbrainz/api/mod.rs b/src/external/musicbrainz/api/mod.rs index dc86686..bc3cc60 100644 --- a/src/external/musicbrainz/api/mod.rs +++ b/src/external/musicbrainz/api/mod.rs @@ -199,7 +199,7 @@ impl From for Mbid { struct SerdeMbidVisitor; -impl<'de> Visitor<'de> for SerdeMbidVisitor { +impl Visitor<'_> for SerdeMbidVisitor { type Value = SerdeMbid; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -237,7 +237,7 @@ impl From for AlbumDate { struct SerdeAlbumDateVisitor; -impl<'de> Visitor<'de> for SerdeAlbumDateVisitor { +impl Visitor<'_> for SerdeAlbumDateVisitor { type Value = SerdeAlbumDate; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/src/external/musicbrainz/api/search/artist.rs b/src/external/musicbrainz/api/search/artist.rs index 8399c4b..51eb93d 100644 --- a/src/external/musicbrainz/api/search/artist.rs +++ b/src/external/musicbrainz/api/search/artist.rs @@ -14,7 +14,7 @@ pub enum SearchArtist<'a> { String(&'a str), } -impl<'a> fmt::Display for SearchArtist<'a> { +impl fmt::Display for SearchArtist<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::String(s) => write!(f, "\"{s}\""), diff --git a/src/external/musicbrainz/api/search/query.rs b/src/external/musicbrainz/api/search/query.rs index 6147d3c..271ca12 100644 --- a/src/external/musicbrainz/api/search/query.rs +++ b/src/external/musicbrainz/api/search/query.rs @@ -228,7 +228,7 @@ mod tests { String(&'a str), } - impl<'a> fmt::Display for TestEntity<'a> { + impl fmt::Display for TestEntity<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::String(s) => write!(f, "\"{s}\""), diff --git a/src/external/musicbrainz/api/search/release_group.rs b/src/external/musicbrainz/api/search/release_group.rs index ae36fe2..628aa1b 100644 --- a/src/external/musicbrainz/api/search/release_group.rs +++ b/src/external/musicbrainz/api/search/release_group.rs @@ -21,7 +21,7 @@ pub enum SearchReleaseGroup<'a> { Rgid(&'a Mbid), } -impl<'a> fmt::Display for SearchReleaseGroup<'a> { +impl fmt::Display for SearchReleaseGroup<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::String(s) => write!(f, "\"{s}\""), diff --git a/src/tui/ui/mod.rs b/src/tui/ui/mod.rs index a633a0f..7c21c68 100644 --- a/src/tui/ui/mod.rs +++ b/src/tui/ui/mod.rs @@ -214,7 +214,7 @@ mod tests { use super::*; // Automock does not support returning types with generic lifetimes. - impl<'app> IAppAccess for AppPublic<'app> { + impl IAppAccess for AppPublic<'_> { fn get(&mut self) -> AppPublic { AppPublic { inner: AppPublicInner {