X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-core%2Fsrc%2Fio%2Fbitreader.rs;h=b5f8de61cb8db863c0f2b09c00327b93e40507b6;hp=c4f9f6c8a3490edeccb1ed4385e495f15ee940a7;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hpb=625751036014b099fd9c126397bc973cb0543130 diff --git a/nihav-core/src/io/bitreader.rs b/nihav-core/src/io/bitreader.rs index c4f9f6c..b5f8de6 100644 --- a/nihav-core/src/io/bitreader.rs +++ b/nihav-core/src/io/bitreader.rs @@ -227,7 +227,7 @@ impl<'a> BitReader<'a> { if nbits == 0 { return Ok(0) } if nbits > 32 { return Err(TooManyBitsRequested) } if self.bits < nbits { - if let Err(err) = self.refill() { return Err(err) } + self.refill()?; if self.bits < nbits { return Err(BitstreamEnd) } } let res = self.read_cache(nbits); @@ -243,7 +243,7 @@ impl<'a> BitReader<'a> { pub fn read_s(&mut self, nbits: u8) -> BitReaderResult { if nbits == 0 || nbits > 32 { return Err(TooManyBitsRequested) } if self.bits < nbits { - if let Err(err) = self.refill() { return Err(err) } + self.refill()?; if self.bits < nbits { return Err(BitstreamEnd) } } let res = self.read_cache_s(nbits); @@ -255,7 +255,7 @@ impl<'a> BitReader<'a> { #[inline(always)] pub fn read_bool(&mut self) -> BitReaderResult { if self.bits < 1 { - if let Err(err) = self.refill() { return Err(err) } + self.refill()?; if self.bits < 1 { return Err(BitstreamEnd) } } let res = self.read_cache(1);