diff options
author | Colin Finck <colin@reactos.org> | 2021-06-04 11:51:05 +0300 |
---|---|---|
committer | Colin Finck <colin@reactos.org> | 2021-06-04 11:51:05 +0300 |
commit | 98ffe4dec521551bb1b0ae904d730d360d3673eb (patch) | |
tree | 980dd99ab65cb4e9021bc34df1d037c3a3f90448 | |
parent | 8ff664400cf226ffc778b19fc42c2c4c5eaea6ae (diff) |
Simplify our `stream_position()`. It can't fail and doesn't need `mut`
-rw-r--r-- | src/attribute_value.rs | 12 | ||||
-rw-r--r-- | src/traits.rs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/attribute_value.rs b/src/attribute_value.rs index f7cd840..9b9e107 100644 --- a/src/attribute_value.rs +++ b/src/attribute_value.rs @@ -61,7 +61,7 @@ impl<'n> NtfsReadSeek for NtfsAttributeValue<'n> { } } - fn stream_position(&mut self) -> Result<u64> { + fn stream_position(&self) -> u64 { match self { Self::Resident(inner) => inner.stream_position(), Self::NonResident(inner) => inner.stream_position(), @@ -206,8 +206,8 @@ impl NtfsReadSeek for NtfsDataRun { } } - fn stream_position(&mut self) -> Result<u64> { - Ok(self.stream_position) + fn stream_position(&self) -> u64 { + self.stream_position } } @@ -431,7 +431,7 @@ impl<'n> NtfsReadSeek for NtfsAttributeNonResidentValue<'n> { while bytes_read < buf.len() { if let Some(data_run) = &mut self.stream_data_run { - if data_run.stream_position()? < data_run.len() { + if data_run.stream_position() < data_run.len() { let bytes_read_in_data_run = data_run.read(fs, &mut buf[bytes_read..])?; bytes_read += bytes_read_in_data_run; self.stream_position += bytes_read_in_data_run as u64; @@ -499,7 +499,7 @@ impl<'n> NtfsReadSeek for NtfsAttributeNonResidentValue<'n> { ))) } - fn stream_position(&mut self) -> Result<u64> { - Ok(self.stream_position) + fn stream_position(&self) -> u64 { + self.stream_position } } diff --git a/src/traits.rs b/src/traits.rs index 01708b8..150e150 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -39,5 +39,5 @@ pub trait NtfsReadSeek { T: Read + Seek; /// See [`std::io::Seek::stream_position`]. - fn stream_position(&mut self) -> Result<u64>; + fn stream_position(&self) -> u64; } |