Merge pull request #9 from aldanor/feature/qoi-upstream-bump

Update upstream libqoi, MSRV->1.62, fix clippy errors

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [stable, beta, nightly, 1.61.0]  # MSRV=1.61
+        rust: [stable, beta, nightly, 1.62.0]  # MSRV=1.62
     steps:
       - uses: actions/checkout@v2
         with: {submodules: true}

Cargo.toml

@@ -14,7 +14,7 @@ keywords = ["qoi", "graphics", "image", "encoding"]
 exclude = [
     "assets/*",
 ]
-rust-version = "1.61.0"
+rust-version = "1.62.0"
 
 [features]
 default = ["std"]

README.md

@@ -38,7 +38,7 @@ qoi-rust           427.4        290.0       1477.7       1002.9
 ```
 
 - Reference C implementation:
-  [phoboslab/qoi@00e34217](https://github.com/phoboslab/qoi/commit/00e34217).
+  [phoboslab/qoi@8d35d93](https://github.com/phoboslab/qoi/commit/8d35d93).
 - Benchmark timings were collected on an Apple M1 laptop.
 - 2846 images from the suite provided upstream
   ([tarball](https://phoboslab.org/files/qoibench/qoi_benchmark_suite.tar)):
@@ -51,7 +51,7 @@ this library proved to be the fastest one by a noticeable margin.
 
 ### Rust version
 
-The minimum required Rust version for the latest crate version is 1.61.0.
+The minimum required Rust version for the latest crate version is 1.62.0.
 
 ### `no_std`
 

src/decode.rs

@@ -137,7 +137,7 @@ pub fn decode_header(data: impl AsRef<[u8]>) -> Result<Header> {
     Header::decode(data)
 }
 
-#[cfg(any(feature = "std"))]
+#[cfg(feature = "std")]
 #[inline]
 fn decode_impl_stream<R: Read, const N: usize, const RGBA: bool>(
     data: &mut R, out: &mut [u8],

src/error.rs

@@ -37,19 +37,19 @@ impl Display for Error {
                 write!(f, "invalid magic: expected {:?}, got {:?}", QOI_MAGIC, magic.to_be_bytes())
             }
             Self::InvalidChannels { channels } => {
-                write!(f, "invalid number of channels: {}", channels)
+                write!(f, "invalid number of channels: {channels}")
             }
             Self::InvalidColorSpace { colorspace } => {
-                write!(f, "invalid color space: {} (expected 0 or 1)", colorspace)
+                write!(f, "invalid color space: {colorspace} (expected 0 or 1)")
             }
             Self::InvalidImageDimensions { width, height } => {
-                write!(f, "invalid image dimensions: {}x{}", width, height)
+                write!(f, "invalid image dimensions: {width}x{height}")
             }
             Self::InvalidImageLength { size, width, height } => {
-                write!(f, "invalid image length: {} bytes for {}x{}", size, width, height)
+                write!(f, "invalid image length: {size} bytes for {width}x{height}")
             }
             Self::OutputBufferTooSmall { size, required } => {
-                write!(f, "output buffer size too small: {} (required: {})", size, required)
+                write!(f, "output buffer size too small: {size} (required: {required})")
             }
             Self::UnexpectedBufferEnd => {
                 write!(f, "unexpected input buffer end while decoding")
@@ -59,7 +59,7 @@ impl Display for Error {
             }
             #[cfg(feature = "std")]
             Self::IoError(ref err) => {
-                write!(f, "i/o error: {}", err)
+                write!(f, "i/o error: {err}")
             }
         }
     }

src/utils.rs

@@ -93,12 +93,12 @@ impl<W: Write> GenericWriter<W> {
 impl<W: Write> Writer for GenericWriter<W> {
     fn write_one(mut self, v: u8) -> Result<Self> {
         self.n_written += 1;
-        self.writer.write_all(&[v]).map(|_| self).map_err(Into::into)
+        self.writer.write_all(&[v]).map(|()| self).map_err(Into::into)
     }
 
     fn write_many(mut self, v: &[u8]) -> Result<Self> {
         self.n_written += v.len();
-        self.writer.write_all(v).map(|_| self).map_err(Into::into)
+        self.writer.write_all(v).map(|()| self).map_err(Into::into)
     }
 
     fn capacity(&self) -> usize {