Update roead dep

akemidx · Jan 19, 2023 · 8f644d1 · 8f644d1
1 parent 8e54b4e
commit 8f644d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ path-slash = "0.1.4"
 parking_lot = "0.12.1"
 pyo3 = { version = "0.16.5", features = ["extension-module", "anyhow"] }
 rayon = "1.5.3"
-roead = { features = ["yaml"], version = "0.18.2"}
+roead = { features = ["yaml"], version = "0.19.0"}
 rustc-hash = "1.1.0"
 rstb = "0.3.2"
 serde = { version = "1.0.144", features = ["derive"] }

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,6 @@
 #![feature(let_chains)]
 #![deny(clippy::unwrap_used)]
+#![feature(scoped_threads)]
 pub mod manager;
 pub mod mergers;
 pub mod settings;

diff --git a/src/mergers/maps.rs b/src/mergers/maps.rs
@@ -137,8 +137,7 @@ impl MapUnit {
                     pack.get_data(&self.get_path())
                         .with_context(|| {
                             jstr!("Failed to read {&self.get_path()} from TitleBG.pack")
-                        })?
-                        .with_context(|| jstr!("{&self.get_path()} missing from TitleBG.pack"))?,
+                        })?,
                 )?)?)
             }
         }
@@ -156,8 +155,7 @@ impl MapUnit {
                     pack.get_data(&self.get_path())
                         .with_context(|| {
                             jstr!("Failed to read {&self.get_path()} from TitleBG.pack")
-                        })?
-                        .with_context(|| jstr!("{&self.get_path()} missing from TitleBG.pack"))?,
+                        })?,
                 )?)?)
             }
         }

diff --git a/src/mergers/texts.rs b/src/mergers/texts.rs
@@ -42,16 +42,14 @@ pub fn diff_language(
                 .get_data(&message_path)
                 .with_context(|| {
                     jstr!("Failed to read {&message_path} from Bootup_{language}.pack")
-                })?
-                .with_context(|| jstr!("{&message_path} missing from Bootup_{language}.pack"))?,
+                })?,
         )?)?;
         let stock_message = Sarc::new(decompress(
             stock_bootup
                 .get_data(&message_path)
                 .with_context(|| {
                     jstr!("Failed to read {&message_path} from Bootup_{language}.pack")
-                })?
-                .with_context(|| jstr!("{&message_path} missing from Bootup_{language}.pack"))?,
+                })?,
         )?)?;
         let diffs = mod_message
             .files()
@@ -67,8 +65,6 @@ pub fn diff_language(
                         .with_context(|| jstr!("Invalid MSBT file: {&path}"))?;
                     if let Some(stock_text) = stock_message
                         .get_data(&path)
-                        .ok()
-                        .flatten()
                         .and_then(|data| Msyt::from_msbt_bytes(data).ok())
                     {
                         if mod_text == stock_text {
@@ -141,15 +137,14 @@ pub fn merge_language(
                 .get_data(&message_path)
                 .with_context(|| {
                     jstr!("Failed to read {&message_path} from Bootup_{language}.pack")
-                })?
-                .with_context(|| jstr!("{&message_path} missing from Bootup_{language}.pack"))?,
+                })?,
         )?)?;
         let mut new_message = SarcWriter::from(&stock_message);
         let merged_files = diffs
             .into_par_iter()
             .map(|(file, diff)| -> Result<(String, Vec<u8>)> {
                 let file = file.replace("msyt", "msbt");
-                if let Ok(Some(stock_file)) = stock_message.get_data(&file) {
+                if let Some(stock_file) = stock_message.get_data(&file) {
                     let mut stock_text = Msyt::from_msbt_bytes(stock_file)?;
                     stock_text.entries.extend(diff.into_iter());
                     Ok((file, stock_text.into_msbt_bytes(endian)?))