From f8c623cd883143ae391fafe04a3c33710d5ff2f9 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Tue, 31 Dec 2024 04:32:39 -0800
Subject: [PATCH] change api for no reason
---
src/file.rs | 4 ++--
src/map.rs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/file.rs b/src/file.rs
index 1cc2d8e..75b89cd 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -92,7 +92,7 @@ impl<R:BinReaderExt> File<R>{
data:input,
})
}
- pub(crate) fn as_mut(&mut self)->&mut R{
+ pub(crate) fn data_mut(&mut self)->&mut R{
&mut self.data
}
pub(crate) fn block_reader(&mut self,block_id:BlockId)->Result<binrw::io::TakeSeek<&mut R>,Error>{
@@ -102,7 +102,7 @@ impl<R:BinReaderExt> File<R>{
let block_start=self.header.block_location[block_id.get() as usize];
let block_end=self.header.block_location[block_id.get() as usize+1];
self.data.seek(std::io::SeekFrom::Start(block_start)).map_err(Error::Seek)?;
- Ok(self.as_mut().take_seek(block_end-block_start))
+ Ok(self.data_mut().take_seek(block_end-block_start))
}
pub(crate) fn fourcc(&self)->FourCC{
self.header.fourcc
diff --git a/src/map.rs b/src/map.rs
index 02f8868..a5ef6f7 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -214,7 +214,7 @@ pub struct StreamableMap<R:BinReaderExt>{
impl<R:BinReaderExt> StreamableMap<R>{
pub(crate) fn new(mut file:crate::file::File<R>)->Result<Self,Error>{
//assume the file seek is in the right place to start reading a map header
- let header:MapHeader=file.as_mut().read_le().map_err(Error::InvalidHeader)?;
+ let header:MapHeader=file.data_mut().read_le().map_err(Error::InvalidHeader)?;
let modes=header.modes.into_iter().map(TryInto::try_into).collect::<Result<_,_>>().map_err(Error::InvalidMode)?;
let attributes=header.attributes.into_iter().map(Into::into).collect();
let render_configs=header.render_configs.into_iter().map(Into::into).collect();