From 2344c4e4b89dcb57c021459140c3914faa4df603 Mon Sep 17 00:00:00 2001 From: Laurent Mazare Date: Fri, 10 Jan 2025 10:15:15 +0100 Subject: [PATCH] Clippy fixes for 1.84. (#2710) --- candle-core/src/strided_index.rs | 5 +---- candle-nn/src/var_builder.rs | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/candle-core/src/strided_index.rs b/candle-core/src/strided_index.rs index 9354e8ea3c..92734b8447 100644 --- a/candle-core/src/strided_index.rs +++ b/candle-core/src/strided_index.rs @@ -36,10 +36,7 @@ impl Iterator for StridedIndex<'_> { type Item = usize; fn next(&mut self) -> Option { - let storage_index = match self.next_storage_index { - None => return None, - Some(storage_index) => storage_index, - }; + let storage_index = self.next_storage_index?; let mut updated = false; let mut next_storage_index = storage_index; for ((multi_i, max_i), stride_i) in self diff --git a/candle-nn/src/var_builder.rs b/candle-nn/src/var_builder.rs index ba410e4ea8..cce6050806 100644 --- a/candle-nn/src/var_builder.rs +++ b/candle-nn/src/var_builder.rs @@ -350,7 +350,7 @@ impl SimpleBackend for candle::npy::NpzTensors { } fn contains_tensor(&self, name: &str) -> bool { - self.get(name).map_or(false, |v| v.is_some()) + self.get(name).is_ok_and(|v| v.is_some()) } } @@ -383,7 +383,7 @@ impl SimpleBackend for candle::pickle::PthTensors { } fn contains_tensor(&self, name: &str) -> bool { - self.get(name).map_or(false, |v| v.is_some()) + self.get(name).is_ok_and(|v| v.is_some()) } }