move SerializedFile functions to impl

7 files changed, 14 insertions, 17 deletions

diff --git a/src/bin/gltf.rs b/src/bin/gltf.rs
index 18d406a..07adec6 100644
--- a/src/bin/gltf.rs
+++ b/src/bin/gltf.rs
@@ -8,7 +8,7 @@ use std::{
 use unity_tools::{
     classes::mesh::{Mesh, VertexDataChannel},
     object::{parser::FromValue, read::read_value},
-    serialized_file::read_serialized_file,
+    serialized_file::SerializedFile,
     unityfs::UnityFS,
 };
 
@@ -27,7 +27,7 @@ fn main() -> anyhow::Result<()> {
         .to_owned();
 
     let mut cab = fs.read(&cabfile)?;
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
     for ob in file.objects {
         cab.seek(SeekFrom::Start(ob.data_offset))?;
         let typetree = if ob.type_id < 0 {
diff --git a/src/bin/json.rs b/src/bin/json.rs
index d669148..2d09306 100644
--- a/src/bin/json.rs
+++ b/src/bin/json.rs
@@ -3,9 +3,7 @@ use std::{
     fs::File,
     io::{BufReader, Seek, SeekFrom, stdout},
 };
-use unity_tools::{
-    object::read::read_value, serialized_file::read_serialized_file, unityfs::UnityFS,
-};
+use unity_tools::{object::read::read_value, serialized_file::SerializedFile, unityfs::UnityFS};
 
 fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
@@ -16,7 +14,7 @@ fn main() -> anyhow::Result<()> {
 
     let node = fs.find_main_file().unwrap().to_owned();
     let mut cab = fs.read(&node)?;
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
     for ob in file.objects {
         cab.seek(SeekFrom::Start(ob.data_offset))?;
         let typetree = if ob.type_id < 0 {
diff --git a/src/bin/meshes.rs b/src/bin/meshes.rs
index 953f2c1..f2b4edf 100644
--- a/src/bin/meshes.rs
+++ b/src/bin/meshes.rs
@@ -8,7 +8,7 @@ use std::{
 use unity_tools::{
     classes::mesh::{Mesh, VertexDataChannel},
     object::{parser::FromValue, read::read_value},
-    serialized_file::read_serialized_file,
+    serialized_file::SerializedFile,
     unityfs::UnityFS,
 };
 
@@ -29,7 +29,7 @@ fn main() -> anyhow::Result<()> {
         .to_owned();
 
     let mut cab = fs.read(&cabfile)?;
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
     for ob in file.objects {
         cab.seek(SeekFrom::Start(ob.data_offset))?;
         let typetree = if ob.type_id < 0 {
diff --git a/src/bin/probe.rs b/src/bin/probe.rs
index 6f46c0a..feca633 100644
--- a/src/bin/probe.rs
+++ b/src/bin/probe.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use std::{env::args, fs::File, io::BufReader};
-use unity_tools::{serialized_file::read_serialized_file_header, unityfs::UnityFS};
+use unity_tools::{serialized_file::SerializedFileHeader, unityfs::UnityFS};
 
 fn main() -> Result<()> {
     let file = BufReader::new(File::open(args().nth(1).unwrap())?);
@@ -8,7 +8,7 @@ fn main() -> Result<()> {
 
     let node = fs.find_main_file().unwrap().to_owned();
     let mut cab = fs.read(&node)?;
-    let ch = read_serialized_file_header(&mut cab)?;
+    let ch = SerializedFileHeader::read(&mut cab)?;
 
     if fs.unity_version.is_ascii() && ch.generator_version.is_ascii() && ch.format < 100 {
         println!(
diff --git a/src/bin/textures.rs b/src/bin/textures.rs
index 209e23c..6ceabac 100644
--- a/src/bin/textures.rs
+++ b/src/bin/textures.rs
@@ -8,7 +8,7 @@ use std::{
 use unity_tools::{
     classes::texture2d::Texture2D,
     object::{parser::FromValue, read::read_value},
-    serialized_file::read_serialized_file,
+    serialized_file::SerializedFile,
     unityfs::UnityFS,
 };
 
@@ -27,7 +27,7 @@ fn main() -> anyhow::Result<()> {
         .to_owned();
 
     let mut cab = fs.read(&cabfile)?;
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
     for ob in file.objects {
         cab.seek(SeekFrom::Start(ob.data_offset))?;
         let typetree = if ob.type_id < 0 {
diff --git a/src/bin/typegraph.rs b/src/bin/typegraph.rs
index b8e26d2..7425778 100644
--- a/src/bin/typegraph.rs
+++ b/src/bin/typegraph.rs
@@ -6,7 +6,7 @@ use std::{
     io::BufReader,
 };
 use unity_tools::{
-    serialized_file::{TypeTreeNode, read_serialized_file},
+    serialized_file::{SerializedFile, TypeTreeNode},
     unityfs::UnityFS,
 };
 
@@ -19,7 +19,7 @@ fn main() -> anyhow::Result<()> {
     let mut edges = BTreeSet::new();
     let node = fs.find_main_file().unwrap().to_owned();
     let mut cab = fs.read(&node)?;
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
 
     for ob in file.objects {
         let typetree = if ob.type_id < 0 {
diff --git a/src/bin/yaml.rs b/src/bin/yaml.rs
index 2899c4c..fd3eec6 100644
--- a/src/bin/yaml.rs
+++ b/src/bin/yaml.rs
@@ -5,8 +5,7 @@ use std::{
     io::{BufReader, Seek, SeekFrom, stdout},
 };
 use unity_tools::{
-    classes::HValue, object::read::read_value, serialized_file::read_serialized_file,
-    unityfs::UnityFS,
+    classes::HValue, object::read::read_value, serialized_file::SerializedFile, unityfs::UnityFS,
 };
 
 fn main() -> anyhow::Result<()> {
@@ -18,7 +17,7 @@ fn main() -> anyhow::Result<()> {
     let node = fs.find_main_file().unwrap().to_owned();
     let mut cab = fs.read(&node)?;
 
-    let file = read_serialized_file(&mut cab)?;
+    let file = SerializedFile::read(&mut cab)?;
     for ob in file.objects {
         cab.seek(SeekFrom::Start(ob.data_offset))?;
         let typetree = if ob.type_id < 0 {