Update Rust toolchain to 1.83 in CI #235

Merged
wojtek merged 2 commits from 234---update-rust-toolchain-to-1.83-in-ci into main 2024-12-30 22:40:07 +01:00
9 changed files with 12 additions and 11 deletions

View File

@ -1,4 +1,4 @@
FROM docker.io/library/rust:1.80 FROM docker.io/library/rust:1.83
RUN rustup component add \ RUN rustup component add \
clippy \ clippy \

View File

@ -7,13 +7,14 @@ on:
branches: [ main ] branches: [ main ]
env: env:
CI_CONTAINER: docker.io/drrobot/musichoard-ci:20241230-1
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
CARGO_TERM_VERBOSE: true CARGO_TERM_VERBOSE: true
jobs: jobs:
build_and_test: build_and_test:
name: Build and Test name: Build and Test
container: docker.io/drrobot/musichoard-ci:20240824-1 container: ${{ env.CI_CONTAINER }}
env: env:
BEETSDIR: ./ BEETSDIR: ./
LLVM_PROFILE_FILE: target/debug/profraw/musichoard-%p-%m.profraw LLVM_PROFILE_FILE: target/debug/profraw/musichoard-%p-%m.profraw
@ -48,7 +49,7 @@ jobs:
lint: lint:
name: Lint name: Lint
container: docker.io/drrobot/musichoard-ci:20240824-1 container: ${{ env.CI_CONTAINER }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: cargo clippy --no-default-features --all-targets -- -D warnings - run: cargo clippy --no-default-features --all-targets -- -D warnings

View File

@ -82,7 +82,7 @@ impl From<DeserializeMbid> for Mbid {
struct DeserializeMbidVisitor; struct DeserializeMbidVisitor;
impl<'de> Visitor<'de> for DeserializeMbidVisitor { impl Visitor<'_> for DeserializeMbidVisitor {
type Value = DeserializeMbid; type Value = DeserializeMbid;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

View File

@ -59,7 +59,7 @@ impl<'a, T: IMusicBrainzRef> From<&'a MbRefOption<T>> for SerializeMbRefOption<'
} }
} }
impl<'a> Serialize for SerializeMbid<'a> { impl Serialize for SerializeMbid<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
S: serde::Serializer, S: serde::Serializer,

View File

@ -199,7 +199,7 @@ impl From<SerdeMbid> for Mbid {
struct SerdeMbidVisitor; struct SerdeMbidVisitor;
impl<'de> Visitor<'de> for SerdeMbidVisitor { impl Visitor<'_> for SerdeMbidVisitor {
type Value = SerdeMbid; type Value = SerdeMbid;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@ -237,7 +237,7 @@ impl From<SerdeAlbumDate> for AlbumDate {
struct SerdeAlbumDateVisitor; struct SerdeAlbumDateVisitor;
impl<'de> Visitor<'de> for SerdeAlbumDateVisitor { impl Visitor<'_> for SerdeAlbumDateVisitor {
type Value = SerdeAlbumDate; type Value = SerdeAlbumDate;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

View File

@ -14,7 +14,7 @@ pub enum SearchArtist<'a> {
String(&'a str), String(&'a str),
} }
impl<'a> fmt::Display for SearchArtist<'a> { impl fmt::Display for SearchArtist<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::String(s) => write!(f, "\"{s}\""), Self::String(s) => write!(f, "\"{s}\""),

View File

@ -228,7 +228,7 @@ mod tests {
String(&'a str), String(&'a str),
} }
impl<'a> fmt::Display for TestEntity<'a> { impl fmt::Display for TestEntity<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::String(s) => write!(f, "\"{s}\""), Self::String(s) => write!(f, "\"{s}\""),

View File

@ -21,7 +21,7 @@ pub enum SearchReleaseGroup<'a> {
Rgid(&'a Mbid), Rgid(&'a Mbid),
} }
impl<'a> fmt::Display for SearchReleaseGroup<'a> { impl fmt::Display for SearchReleaseGroup<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::String(s) => write!(f, "\"{s}\""), Self::String(s) => write!(f, "\"{s}\""),

View File

@ -214,7 +214,7 @@ mod tests {
use super::*; use super::*;
// Automock does not support returning types with generic lifetimes. // Automock does not support returning types with generic lifetimes.
impl<'app> IAppAccess for AppPublic<'app> { impl IAppAccess for AppPublic<'_> {
fn get(&mut self) -> AppPublic { fn get(&mut self) -> AppPublic {
AppPublic { AppPublic {
inner: AppPublicInner { inner: AppPublicInner {