From 4bcc7904c2077ff1e15f818b95e3236ee1ac41db Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 16 May 2021 20:46:21 -0400 Subject: [PATCH] minor method naming adjustments --- psoutils/src/quest/bin.rs | 10 +++++----- psoutils/src/quest/dat.rs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/psoutils/src/quest/bin.rs b/psoutils/src/quest/bin.rs index 565a2de..3796f0f 100644 --- a/psoutils/src/quest/bin.rs +++ b/psoutils/src/quest/bin.rs @@ -204,7 +204,7 @@ impl QuestBin { Ok(QuestBin::from_uncompressed_bytes(&mut reader)?) } - pub fn to_uncompressed_bytes( + pub fn write_uncompressed_bytes( &self, writer: &mut T, ) -> Result<(), QuestBinError> { @@ -265,14 +265,14 @@ impl QuestBin { Ok(()) } - pub fn as_uncompressed_bytes(&self) -> Result, QuestBinError> { + pub fn to_uncompressed_bytes(&self) -> Result, QuestBinError> { let mut buffer = Cursor::new(Vec::::new()); - self.to_uncompressed_bytes(&mut buffer)?; + self.write_uncompressed_bytes(&mut buffer)?; Ok(buffer.into_inner().into_boxed_slice()) } - pub fn as_compressed_bytes(&self) -> Result, QuestBinError> { - let uncompressed = self.as_uncompressed_bytes()?; + pub fn to_compressed_bytes(&self) -> Result, QuestBinError> { + let uncompressed = self.to_uncompressed_bytes()?; Ok(prs_compress(uncompressed.as_ref())) } diff --git a/psoutils/src/quest/dat.rs b/psoutils/src/quest/dat.rs index 1cb331e..dfcf564 100644 --- a/psoutils/src/quest/dat.rs +++ b/psoutils/src/quest/dat.rs @@ -230,7 +230,7 @@ impl QuestDat { Ok(QuestDat::from_uncompressed_bytes(&mut reader)?) } - pub fn to_uncompressed_bytes( + pub fn write_uncompressed_bytes( &self, writer: &mut T, ) -> Result<(), QuestDatError> { @@ -255,14 +255,14 @@ impl QuestDat { Ok(()) } - pub fn as_uncompressed_bytes(&self) -> Result, QuestDatError> { + pub fn to_uncompressed_bytes(&self) -> Result, QuestDatError> { let mut buffer = Cursor::new(Vec::::new()); - self.to_uncompressed_bytes(&mut buffer)?; + self.write_uncompressed_bytes(&mut buffer)?; Ok(buffer.into_inner().into_boxed_slice()) } - pub fn as_compressed_bytes(&self) -> Result, QuestDatError> { - let uncompressed = self.as_uncompressed_bytes()?; + pub fn to_compressed_bytes(&self) -> Result, QuestDatError> { + let uncompressed = self.to_uncompressed_bytes()?; Ok(prs_compress(uncompressed.as_ref())) }