Merge pull request #954 from LaurentMazare/clippy-1.87

Fixes for clippy 1.87.

Author: LaurentMazare

examples/stable-diffusion/main.rs

@@ -2423,7 +2423,7 @@ impl DDIMScheduler {
 
     // https://github.com/huggingface/diffusers/blob/6e099e2c8ce4c4f5c7318e970a8c093dc5c7046e/src/diffusers/schedulers/scheduling_ddim.py#L195
     fn step(&self, model_output: &Tensor, timestep: usize, sample: &Tensor) -> Tensor {
-        let prev_timestep = if timestep > self.step_ratio { timestep - self.step_ratio } else { 0 };
+        let prev_timestep = timestep.saturating_sub(self.step_ratio);
 
         let alpha_prod_t = self.alphas_cumprod[timestep];
         let alpha_prod_t_prev = self.alphas_cumprod[prev_timestep];

src/vision/mnist.rs

@@ -18,10 +18,9 @@ fn read_u32<T: Read>(reader: &mut T) -> Result<u32> {
 fn check_magic_number<T: Read>(reader: &mut T, expected: u32) -> Result<()> {
     let magic_number = read_u32(reader)?;
     if magic_number != expected {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!("incorrect magic number {magic_number} != {expected}"),
-        ));
+        return Err(io::Error::other(format!(
+            "incorrect magic number {magic_number} != {expected}"
+        )));
     }
     Ok(())
 }

src/wrappers/utils.rs

@@ -48,10 +48,9 @@ pub(super) fn path_to_cstring<T: AsRef<std::path::Path>>(
     let path = path.as_ref();
     match path.to_str() {
         Some(path) => Ok(std::ffi::CString::new(path)?),
-        None => Err(TchError::Io(io::Error::new(
-            io::ErrorKind::Other,
-            format!("path {path:?} cannot be converted to UTF-8"),
-        ))),
+        None => Err(TchError::Io(io::Error::other(format!(
+            "path {path:?} cannot be converted to UTF-8"
+        )))),
     }
 }