Merge pull request 'Miscellaneous changes' (#239) from feat/ci into master

Reviewed-on: #239

.ci/tasks/clippy.sh

@@ -10,6 +10,6 @@ title "Install clippy"
 rustup component add clippy
 
 title "Run clippy"
-cargo clippy --color always --no-deps
+cargo clippy --color always --no-deps -- -D warnings
 
 title "Done"

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "lib/serde_sjson"]
-	path = lib/serde_sjson
-	url = https://git.sclu1034.dev/lucas/serde_sjson.git
 [submodule "lib/luajit2-sys"]
 	path = lib/luajit2-sys
 	url = https://github.com/sclu1034/luajit2-sys.git

Cargo.lock

@@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43e7fd8284f025d0bd143c2855618ecdf697db55bde39211e5c9faec7669173"
 dependencies = [
  "heapless",
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -383,7 +383,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -2033,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2274,14 +2274,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "nom_locate"
-version = "4.2.0"
+name = "nom"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "nom_locate"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b577e2d69827c4740cba2b52efaad1c4cc7c73042860b199710b3575c68438d"
 dependencies = [
  "bytecount",
  "memchr",
- "nom",
+ "nom 8.0.0",
 ]
 
 [[package]]
@@ -3036,7 +3045,7 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -3269,9 +3278,11 @@ dependencies = [
 
 [[package]]
 name = "serde_sjson"
-version = "1.0.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c5b0d7af37492e99b8559436ee76b9ec8935c75449b1c2ef08c205a9e92ae6f"
 dependencies = [
- "nom",
+ "nom 8.0.0",
  "nom_locate",
  "serde",
 ]
@@ -4374,7 +4385,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4682,7 +4693,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]

Cargo.toml

@@ -6,7 +6,6 @@ members = [
     "lib/dtmt-shared",
     "lib/oodle",
     "lib/sdk",
-    "lib/serde_sjson",
     "lib/luajit2-sys",
     "lib/color-eyre",
 ]
@@ -35,7 +34,7 @@ glob = "0.3.0"
 interprocess = "2.1.0"
 lazy_static = "1.4.0"
 luajit2-sys = { path = "lib/luajit2-sys" }
-minijinja = { version = "2.0.1", default-features = false }
+minijinja = { version = "2.0.1", default-features = false, features = ["serde"] }
 nanorand = "0.7.0"
 nexusmods = { path = "lib/nexusmods" }
 notify = "8.0.0"
@@ -47,7 +46,7 @@ pin-project-lite = "0.2.9"
 promptly = "0.3.1"
 sdk = { path = "lib/sdk" }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
-serde_sjson = { path = "lib/serde_sjson" }
+serde_sjson = "1.2.1"
 steamlocate = "2.0.0-beta.2"
 strip-ansi-escapes = "0.2.0"
 time = { version = "0.3.20", features = ["serde", "serde-well-known", "local-offset", "formatting", "macros"] }

crates/dtmm/src/controller/deploy.rs

@@ -116,14 +116,14 @@ async fn patch_game_settings(state: Arc<ActionState>) -> Result<()> {
         eyre::bail!("couldn't find 'boot_script' field");
     };
 
-    f.write_all(settings[0..i].as_bytes()).await?;
+    f.write_all(&settings.as_bytes()[0..i]).await?;
     f.write_all(b"boot_script = \"scripts/mod_main\"").await?;
 
     let Some(j) = settings[i..].find('\n') else {
         eyre::bail!("couldn't find end of 'boot_script' field");
     };
 
-    f.write_all(settings[(i + j)..].as_bytes()).await?;
+    f.write_all(&settings.as_bytes()[(i + j)..]).await?;
 
     Ok(())
 }
@@ -453,10 +453,7 @@ async fn build_bundles(state: Arc<ActionState>) -> Result<Vec<Bundle>> {
 }
 
 #[tracing::instrument(skip_all)]
-async fn patch_boot_bundle(
-    state: Arc<ActionState>,
-    deployment_info: &String,
-) -> Result<Vec<Bundle>> {
+async fn patch_boot_bundle(state: Arc<ActionState>, deployment_info: &str) -> Result<Vec<Bundle>> {
     let bundle_dir = Arc::new(state.game_dir.join("bundle"));
     let bundle_path = bundle_dir.join(format!("{:x}", Murmur64::hash(BOOT_BUNDLE_NAME.as_bytes())));
 
@@ -590,11 +587,7 @@ fn build_deployment_data(
             .map(|bundle| format!("{:x}", bundle.name().to_murmur64()))
             .collect(),
         // TODO:
-        mod_folders: mod_folders
-            .as_ref()
-            .iter()
-            .map(|folder| folder.clone())
-            .collect(),
+        mod_folders: mod_folders.as_ref().to_vec(),
     };
     serde_sjson::to_string(&info).wrap_err("Failed to serizalize deployment data")
 }

crates/dtmm/src/controller/game.rs

@@ -91,14 +91,14 @@ async fn patch_game_settings(state: Arc<ActionState>) -> Result<()> {
         eyre::bail!("couldn't find 'boot_script' field");
     };
 
-    f.write_all(settings[0..i].as_bytes()).await?;
+    f.write_all(&settings.as_bytes()[0..i]).await?;
     f.write_all(b"boot_script = \"scripts/mod_main\"").await?;
 
     let Some(j) = settings[i..].find('\n') else {
         eyre::bail!("couldn't find end of 'boot_script' field");
     };
 
-    f.write_all(settings[(i + j)..].as_bytes()).await?;
+    f.write_all(&settings.as_bytes()[(i + j)..]).await?;
 
     Ok(())
 }
@@ -208,7 +208,7 @@ pub(crate) async fn reset_mod_deployment(state: ActionState) -> Result<()> {
 
     for p in paths {
         let path = bundle_dir.join(p);
-        let backup = bundle_dir.join(&format!("{}.bak", p));
+        let backup = bundle_dir.join(format!("{}.bak", p));
 
         let res = async {
             tracing::debug!(

crates/dtmm/src/controller/import.rs

@@ -397,7 +397,7 @@ fn extract_legacy_mod<R: Read + Seek>(
             tracing::trace!("Writing file '{}'", name.display());
             let mut out = std::fs::OpenOptions::new()
                 .write(true)
-                .create(true)
+                .truncate(true)
                 .open(&name)
                 .wrap_err_with(|| format!("Failed to open file '{}'", name.display()))?;
 

crates/dtmt/src/cmd/bundle/extract.rs

@@ -150,7 +150,7 @@ async fn parse_command_line_template(tmpl: &String) -> Result<CmdLine> {
             String::from_utf8_unchecked(bytes.to_vec())
         });
 
-        while let Some(arg) = parsed.next() {
+        for arg in parsed.by_ref() {
             // Safety: See above.
             cmd.arg(unsafe { String::from_utf8_unchecked(arg.to_vec()) });
         }

crates/dtmt/src/shell_parse.rs

@@ -54,17 +54,11 @@ impl<'a> ShellParser<'a> {
                     }
                     _ => {}
                 },
-                ParserState::SingleQuote => match c {
-                    b'\'' => {
+                ParserState::SingleQuote => if c == b'\'' {
                     return Some(&self.bytes[start..(self.offset - 1)]);
-                    }
-                    _ => {}
                 },
-                ParserState::DoubleQuote => match c {
-                    b'"' => {
+                ParserState::DoubleQuote => if c == b'"' {
                     return Some(&self.bytes[start..(self.offset - 1)]);
-                    }
-                    _ => {}
                 },
             }
         }

lib/sdk/src/bundle/mod.rs

@@ -237,7 +237,7 @@ impl Bundle {
 
         // Ceiling division (or division toward infinity) to calculate
         // the number of chunks required to fit the unpacked data.
-        let num_chunks = (unpacked_data.len() + CHUNK_SIZE - 1) / CHUNK_SIZE;
+        let num_chunks = unpacked_data.len().div_ceil(CHUNK_SIZE);
         tracing::trace!(num_chunks);
         w.write_u32(num_chunks as u32)?;
 

lib/sdk/src/filetype/lua.rs

@@ -125,7 +125,7 @@ pub fn compile(name: impl Into<IdString64>, code: impl AsRef<str>) -> Result<Bun
     tracing::trace!(
         "Compiling '{}', {} bytes of code",
         name.display(),
-        code.as_bytes().len()
+        code.len()
     );
 
     let bytecode = unsafe {
@@ -156,10 +156,10 @@ pub fn compile(name: impl Into<IdString64>, code: impl AsRef<str>) -> Result<Bun
             }
             _ => unreachable!(),
         }
-        lua::lua_setglobal(state, b"fn\0".as_ptr() as _);
+        lua::lua_setglobal(state, c"fn".as_ptr());
 
-        let run = b"return string.dump(fn, false)\0";
-        match lua::luaL_loadstring(state, run.as_ptr() as _) as u32 {
+        let run = c"return string.dump(fn, false)";
+        match lua::luaL_loadstring(state, run.as_ptr()) as u32 {
             lua::LUA_OK => {}
             lua::LUA_ERRSYNTAX => {
                 let err = lua::lua_tostring(state, -1);

lib/sdk/src/filetype/strings.rs

@@ -28,10 +28,14 @@ impl Language {
 #[derive(serde::Serialize)]
 pub struct Strings(HashMap<String, HashMap<Language, String>>);
 
+#[inline(always)]
 fn read_string<R>(r: R) -> Result<String>
 where
     R: Read,
 {
+    // We can safely ignore the warning here, as all data is already in memory, and no additional
+    // `BufReader` should be needed.
+    #[allow(clippy::unbuffered_bytes)]
     r.bytes()
         .take_while(|b| b.as_ref().map(|b| *b != 0).unwrap_or(false))
         .map(|b| b.map_err(Report::new))
@@ -41,7 +45,7 @@ where
 
 impl Strings {
     #[tracing::instrument(skip_all, fields(languages = variants.len()))]
-    pub fn from_variants(ctx: &crate::Context, variants: &Vec<BundleFileVariant>) -> Result<Self> {
+    pub fn from_variants(ctx: &crate::Context, variants: &[BundleFileVariant]) -> Result<Self> {
         let mut map: HashMap<String, HashMap<Language, String>> = HashMap::new();
 
         for (i, variant) in variants.iter().enumerate() {
@@ -76,7 +80,7 @@ impl Strings {
 }
 
 #[tracing::instrument(skip_all)]
-pub fn decompile(ctx: &crate::Context, variants: &Vec<BundleFileVariant>) -> Result<Vec<UserFile>> {
+pub fn decompile(ctx: &crate::Context, variants: &[BundleFileVariant]) -> Result<Vec<UserFile>> {
     let strings = Strings::from_variants(ctx, variants)?;
     let content = strings.to_sjson()?;
 

lib/serde_sjson

@@ -1 +0,0 @@
-Subproject commit 73d2b23ce50e75b184f5092ad515e97a0adbe6da