build: rust edition 2024 (#130)

Author: francisdb

.github/workflows/clippy.yml

@@ -19,6 +19,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install minimal stable with clippy and rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: rustfmt, clippy
       - name: Run Clippy
         run: cargo clippy --color always --all-targets --all-features
       - name: Run fmt check

.github/workflows/release-plz.yml

@@ -18,8 +18,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install minimal stable with clippy and rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: rustfmt, clippy
       - name: Run release-plz
         uses: MarcoIeni/release-plz-action@v0.5
         env:

.github/workflows/rust.yml

@@ -31,11 +31,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      # make sure we are on rust 1.79
-      # see https://github.com/tuffy/bitstream-io/commit/241eaed73b0cd814640ceaf01b8220e5c98927d6#commitcomment-143198388
-      # TODO remove this once github is on a newer version of rust
-      - name: Set up Rust
-        run: rustup update
+      - name: Install minimal stable with clippy and rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: rustfmt, clippy
       - name: Build
         run: cargo build --verbose
       - name: Run tests

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "vpin"
 version = "0.17.4"
-edition = "2021"
+edition = "2024"
 description = "Rust library for the virtual pinball ecosystem"
 repository = "https://github.com/francisdb/vpin"
 readme = "README.md"

examples/create_basic_vpx_file.rs

@@ -1,11 +1,11 @@
 use std::path::Path;
 use vpin::vpx;
+use vpin::vpx::VPX;
 use vpin::vpx::color::Color;
+use vpin::vpx::gameitem::GameItemEnum;
 use vpin::vpx::gameitem::bumper::Bumper;
 use vpin::vpx::gameitem::flipper::Flipper;
-use vpin::vpx::gameitem::GameItemEnum;
 use vpin::vpx::material::Material;
-use vpin::vpx::VPX;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut vpx = VPX::default();

src/vpx/biff.rs

@@ -1,6 +1,6 @@
 use encoding_rs::mem::{decode_latin1, encode_latin1_lossy};
-use nom::number::complete::{le_f32, le_f64, le_i16, le_i32, le_i64, le_u16, le_u32, le_u64};
 use nom::ToUsize;
+use nom::number::complete::{le_f32, le_f64, le_i16, le_i32, le_i64, le_u16, le_u32, le_u64};
 use utf16string::WStr;
 
 use super::model::{StringEncoding, StringWithEncoding};

src/vpx/expanded.rs

@@ -15,19 +15,19 @@ use image::DynamicImage;
 use serde::de;
 use serde_json::Value;
 
-use super::{gameitem, read_gamedata, Version, VPX};
+use super::{VPX, Version, gameitem, read_gamedata};
 
 use super::collection::Collection;
 use super::font;
 use super::gamedata::{GameData, GameDataJson};
 use super::sound;
-use super::sound::{read_sound, write_sound, SoundData, SoundDataJson};
+use super::sound::{SoundData, SoundDataJson, read_sound, write_sound};
 use super::version;
 use crate::vpx::biff::{BiffRead, BiffReader};
 use crate::vpx::custominfotags::CustomInfoTags;
 use crate::vpx::font::{FontData, FontDataJson};
-use crate::vpx::gameitem::primitive::Primitive;
 use crate::vpx::gameitem::GameItemEnum;
+use crate::vpx::gameitem::primitive::Primitive;
 use crate::vpx::image::{ImageData, ImageDataBits, ImageDataJson};
 use crate::vpx::jsonmodel::{collections_json, info_to_json, json_to_collections, json_to_info};
 use crate::vpx::lzw::{from_lzw_blocks, to_lzw_blocks};
@@ -37,7 +37,7 @@ use crate::vpx::material::{
     SavePhysicsMaterialJson,
 };
 use crate::vpx::model::Vertex3dNoTex2;
-use crate::vpx::obj::{read_obj_file, write_obj, ObjData};
+use crate::vpx::obj::{ObjData, read_obj_file, write_obj};
 use crate::vpx::renderprobe::{RenderProbeJson, RenderProbeWithGarbage};
 use crate::vpx::tableinfo::TableInfo;
 
@@ -594,7 +594,7 @@ fn read_image_bmp(data: &[u8]) -> io::Result<ImageBmp> {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidData,
                 format!("BMP image uses {:?}, expecting Rgb8 or Rgba8 format", other),
-            ))
+            ));
         }
     };
 

src/vpx/gameitem.rs

@@ -677,9 +677,9 @@ fn write_with_type<T: BiffWrite>(item_type: u32, item: &T) -> Vec<u8> {
 
 #[cfg(test)]
 mod tests {
+    use rand::Rng;
     use rand::distr::{Distribution, StandardUniform};
     use rand::prelude::ThreadRng;
-    use rand::Rng;
 
     /// see https://github.com/rust-random/rand/issues/1573
     pub(crate) trait RandomOption {

src/vpx/gameitem/bumper.rs

@@ -3,7 +3,7 @@ use crate::vpx::json::F32WithNanInf;
 use fake::Dummy;
 use serde::{Deserialize, Serialize};
 
-use super::{vertex2d::Vertex2D, GameItem};
+use super::{GameItem, vertex2d::Vertex2D};
 
 #[derive(Debug, Dummy, PartialEq)]
 pub struct Bumper {

src/vpx/gameitem/decal.rs

@@ -6,7 +6,7 @@ use fake::Dummy;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 
-use super::{font::Font, font::FontJson, vertex2d::Vertex2D, GameItem};
+use super::{GameItem, font::Font, font::FontJson, vertex2d::Vertex2D};
 
 #[derive(Debug, PartialEq, Dummy, Clone)]
 pub enum DecalType {

src/vpx/gameitem/flipper.rs

@@ -2,7 +2,7 @@ use crate::vpx::biff::{self, BiffRead, BiffReader, BiffWrite};
 use fake::Dummy;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use super::{vertex2d::Vertex2D, GameItem};
+use super::{GameItem, vertex2d::Vertex2D};
 
 #[derive(Debug, PartialEq, Clone, Dummy)]
 pub struct Flipper {

src/vpx/gameitem/textbox.rs

@@ -354,7 +354,7 @@ mod tests {
     use std::collections::HashSet;
 
     use super::*;
-    use crate::vpx::gameitem::font::{FontStyle, CHARSET_ANSI};
+    use crate::vpx::gameitem::font::{CHARSET_ANSI, FontStyle};
     use pretty_assertions::assert_eq;
 
     #[test]

src/vpx/mod.rs

@@ -32,7 +32,7 @@ use crate::vpx::biff::BiffReader;
 use crate::vpx::expanded::vpx_image_to_dynamic_image;
 use crate::vpx::image::ImageDataJpeg;
 use crate::vpx::tableinfo::read_tableinfo;
-use tableinfo::{write_tableinfo, TableInfo};
+use tableinfo::{TableInfo, write_tableinfo};
 use version::Version;
 
 use self::biff::{BiffRead, BiffWrite, BiffWriter};

src/vpx/sound.rs

@@ -1,14 +1,14 @@
 use std::fmt;
 
-use crate::vpx::wav::{read_wav_header, write_wav_header, WavHeader};
+use crate::vpx::wav::{WavHeader, read_wav_header, write_wav_header};
 use bytes::{BufMut, BytesMut};
 use fake::Dummy;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 
 use super::{
-    biff::{BiffReader, BiffWriter},
     Version,
+    biff::{BiffReader, BiffWriter},
 };
 
 #[derive(Debug, PartialEq, Dummy, Clone)]

src/vpx/tableinfo.rs

@@ -1,7 +1,7 @@
 use cfb::CompoundFile;
 use std::collections::HashMap;
 use std::io::{Read, Seek, Write};
-use std::path::{Path, MAIN_SEPARATOR_STR};
+use std::path::{MAIN_SEPARATOR_STR, Path};
 use utf16string::{LittleEndian, WStr, WString};
 
 // >    "/TableInfo/AuthorName",

src/vpx/version.rs

@@ -4,7 +4,7 @@ use std::{
     cmp,
     fmt::Display,
     io::{self, Read, Seek, Write},
-    path::{Path, MAIN_SEPARATOR_STR},
+    path::{MAIN_SEPARATOR_STR, Path},
 };
 
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};

tests/common/mod.rs

@@ -8,7 +8,7 @@ use std::ffi::OsStr;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::io;
 use std::io::{Read, Seek, Write};
-use std::path::{Path, PathBuf, MAIN_SEPARATOR_STR};
+use std::path::{MAIN_SEPARATOR_STR, Path, PathBuf};
 use vpin::vpx::biff::BiffReader;
 use vpin::vpx::lzw::from_lzw_blocks;
 use walkdir::WalkDir;