Satisfy Rust 1.87 clippy

Author: ginnyTheCat

.github/workflows/CI.yml

@@ -49,7 +49,7 @@ jobs:
         run: cargo package --manifest-path mupdf-sys/Cargo.toml
 
   test-wasm:
-    name: Test WASM Emscripten
+    name: Test Suite (Emscripten)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -58,7 +58,7 @@ jobs:
           fetch-depth: 500
       - uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown
+          targets: wasm32-unknown-emscripten
       - uses: mymindstorm/setup-emsdk@v14
 
       - run: cargo test --target wasm32-unknown-emscripten --features serde

mupdf-sys/build.rs

@@ -138,7 +138,7 @@ fn find_clang_sysroot(target: &Target) -> Result<Option<String>> {
                 "Using emscripten requires the EMSDK environment variable to be set".to_owned()
             }
             _ => {
-                format!("Invalid EMSDK environment variable: {}", e)
+                format!("Invalid EMSDK environment variable: {e}")
             }
         })?;
 

mupdf-sys/docs.rs

@@ -40,7 +40,7 @@ impl ParseCallbacks for DocsCallbacks {
             return None;
         }
 
-        let name = format!("{}_{}", enum_name, original_variant_name);
+        let name = format!("{enum_name}_{original_variant_name}");
         self.full_names
             .borrow_mut()
             .insert(original_variant_name.to_owned(), name);
@@ -90,21 +90,21 @@ impl ParseCallbacks for DocsCallbacks {
             let mut line = self.types.replace_all(&line, |c: &regex::Captures| {
                 let name = &c[0];
                 if name.contains('*') {
-                    return format!("`{}`", name);
+                    return format!("`{name}`");
                 }
 
                 let full_names = self.full_names.borrow();
                 if let Some(full_name) = full_names.get(name) {
-                    return format!("[`{}`]({})", name, full_name);
+                    return format!("[`{name}`]({full_name})");
                 }
 
                 if let Some(short_name) = name.strip_suffix("s") {
                     if let Some(full_name) = full_names.get(short_name) {
-                        return format!("[`{}`]({})s", short_name, full_name);
+                        return format!("[`{short_name}`]({full_name})s");
                     }
                 }
 
-                format!("[`{}`]", name)
+                format!("[`{name}`]")
             });
 
             if let Some((first, rest)) = line.split_once(": ") {

src/buffer.rs

@@ -99,15 +99,13 @@ impl Buffer {
 
 impl io::Read for Buffer {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.read_bytes(buf)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))
+        self.read_bytes(buf).map_err(io::Error::other)
     }
 }
 
 impl io::Write for Buffer {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.write_bytes(buf)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))
+        self.write_bytes(buf).map_err(io::Error::other)
     }
 
     fn flush(&mut self) -> io::Result<()> {

src/pdf/object.rs

@@ -351,7 +351,7 @@ impl Write for PdfObject {
         let mut fz_buf = Buffer::with_capacity(len);
         fz_buf.write(buf)?;
         self.write_stream_buffer(&fz_buf)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+            .map_err(io::Error::other)?;
         Ok(len)
     }