Move to 2024 edition, fix oddities from 2021

tinythings · Feb 21, 2025 · b99057a · b99057a
1 parent ebd028f
commit b99057a
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sysinspect"
-version = "0.2.0"
-edition = "2021"
+version = "0.3.0"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/libsysinspect/Cargo.toml b/libsysinspect/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "libsysinspect"
-version = "0.2.0"
-edition = "2021"
+version = "0.3.0"
+edition = "2024"
 
 [dependencies]
 base64 = "0.22.1"
@@ -21,9 +21,15 @@ rand = "0.8.5"
 regex = "1.10.6"
 rsa = { version = "0.9.6", features = ["pkcs5", "sha1", "sha2"] }
 #rustpython = { path = "../../RustPython", features = ["freeze-stdlib"] }
-rustpython-pylib = { git="https://github.com/RustPython/RustPython.git", features = ["freeze-stdlib"] }
-rustpython = { git="https://github.com/RustPython/RustPython.git", features = ["freeze-stdlib"] }
-rustpython-vm = { git = "https://github.com/RustPython/RustPython.git", features = ["freeze-stdlib"] }
+rustpython-pylib = { git = "https://github.com/RustPython/RustPython.git", features = [
+    "freeze-stdlib",
+] }
+rustpython = { git = "https://github.com/RustPython/RustPython.git", features = [
+    "freeze-stdlib",
+] }
+rustpython-vm = { git = "https://github.com/RustPython/RustPython.git", features = [
+    "freeze-stdlib",
+] }
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
 serde_yaml = "0.9.34"

diff --git a/libsysinspect/src/mdescr/datapatch.rs b/libsysinspect/src/mdescr/datapatch.rs
@@ -38,7 +38,7 @@ fn modbase(base: &mut Value, mods: IndexMap<Vec<String>, Value>) {
             };
 
             let next = {
-                if let Value::Mapping(ref mut m) = cv {
+                if let Value::Mapping(m) = cv {
                     if rm {
                         m.remove(Value::String(clr_k.clone()));
                         None

diff --git a/libsysinspect/src/mdescr/mspec.rs b/libsysinspect/src/mdescr/mspec.rs
@@ -1,5 +1,5 @@
 use super::{datapatch, mspecdef::ModelSpec};
-use crate::{cfg::select_config_path, tmpl::render::ModelTplRender, traits::systraits::SystemTraits, SysinspectError};
+use crate::{SysinspectError, cfg::select_config_path, tmpl::render::ModelTplRender, traits::systraits::SystemTraits};
 use indexmap::IndexMap;
 use serde_yaml::Value;
 use std::{
@@ -92,7 +92,7 @@ impl SpecLoader {
 
         for chunk in chunks {
             match (&mut base, chunk) {
-                (Value::Mapping(ref mut amp), Value::Mapping(bmp)) => {
+                (Value::Mapping(amp), Value::Mapping(bmp)) => {
                     for (k, v) in bmp {
                         if let Some(av) = amp.get_mut(k) {
                             if let (Some(av_map), Some(v_map)) = (av.as_mapping_mut(), v.as_mapping_mut()) {

diff --git a/modules/fs/file/Cargo.toml b/modules/fs/file/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "file"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 chrono = "0.4.39"

diff --git a/modules/sys/net/Cargo.toml b/modules/sys/net/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "net"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libsysinspect = { path = "../../../libsysinspect" }

diff --git a/modules/sys/proc/Cargo.toml b/modules/sys/proc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "proc"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libsysinspect = { path = "../../../libsysinspect" }

diff --git a/modules/sys/run/Cargo.toml b/modules/sys/run/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "run"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libsysinspect = { path = "../../../libsysinspect" }

diff --git a/modules/sys/ssrun/Cargo.toml b/modules/sys/ssrun/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ssrun"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 libsysinspect = { path = "../../../libsysinspect" }

diff --git a/sysmaster/Cargo.toml b/sysmaster/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sysmaster"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 clap = { version = "4.5.20", features = ["unstable-styles"] }
@@ -36,3 +36,4 @@ actix-web = "4.9.0"
 once_cell = "1.20.2"
 daemonize = "0.5.0"
 indexmap = { version = "2.7.1", features = ["serde"] }
+rusqlite = { version = "0.33.0", features = ["bundled"] }
diff --git a/sysminion/Cargo.toml b/sysminion/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sysminion"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 clap = { version = "4.5.20", features = ["unstable-styles"] }