Skip to content

Commit

Permalink
POC for reader without lifetimes
Browse files Browse the repository at this point in the history
  • Loading branch information
wgreenberg committed Jan 23, 2025
1 parent 7b09220 commit fd36357
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ enum Leftover {
}

/// Reader to use with `from_reader_with_ctx`
pub struct Reader<'a, R: Read + Seek> {
inner: &'a mut R,
pub struct Reader<R: Read + Seek> {
inner: R,
/// bits stored from previous reads that didn't read to the end of a byte size
leftover: Option<Leftover>,
/// Amount of bits read after last read, reseted before reading enum ids
Expand All @@ -42,7 +42,7 @@ pub struct Reader<'a, R: Read + Seek> {
pub bits_read: usize,
}

impl<R: Read + Seek> Seek for Reader<'_, R> {
impl<R: Read + Seek> Seek for Reader<R> {
#[inline]
fn seek(&mut self, pos: SeekFrom) -> no_std_io::io::Result<u64> {
#[cfg(feature = "logging")]
Expand All @@ -54,17 +54,17 @@ impl<R: Read + Seek> Seek for Reader<'_, R> {
}
}

impl<R: Read + Seek> AsMut<R> for Reader<'_, R> {
impl<R: Read + Seek> AsMut<R> for Reader<R> {
#[inline]
fn as_mut(&mut self) -> &mut R {
self.inner
&mut self.inner
}
}

impl<'a, R: Read + Seek> Reader<'a, R> {
impl<'a, R: Read + Seek> Reader<R> {
/// Create a new `Reader`
#[inline]
pub fn new(inner: &'a mut R) -> Self {
pub fn new(inner: R) -> Self {
Self {
inner,
leftover: None,
Expand All @@ -87,7 +87,7 @@ impl<'a, R: Read + Seek> Reader<'a, R> {

/// Consume self, returning inner Reader
#[inline]
pub fn into_inner(self) -> &'a mut R {
pub fn into_inner(self) -> R {
self.inner
}

Expand Down

0 comments on commit fd36357

Please sign in to comment.