commit 2547c00e1d0c34dea7f80168f36f5ddc557b3b0d
author David Brown <david.brown@linaro.org> Wed Mar 10 05:20:17 2021 -0700
committer David Brown <davidb@davidb.org> Thu Mar 11 07:25:43 2021 -0700
tree 8e1161a06ca6d05f16d8a0b3726ef9d96e868e85
parent c20bbb22e3591473ac85f02da6e72133083a82e1

sim: Use range `contains` when possible

Clippy suggests using a range with `contains` in situations where we
test if a value is within a range.

Signed-off-by: David Brown <david.brown@linaro.org>

sim/simflash/src/lib.rs

diff --git a/sim/simflash/src/lib.rs b/sim/simflash/src/lib.rs
index 009148c..532fb0e 100644
--- a/sim/simflash/src/lib.rs
+++ b/sim/simflash/src/lib.rs
@@ -230,7 +230,7 @@
     /// Adds a new flash bad region. Writes to this area fail with a chance
     /// given by `rate`.
     fn add_bad_region(&mut self, offset: usize, len: usize, rate: f32) -> Result<()> {
-        if rate < 0.0 || rate > 1.0 {
+        if !(0.0..=1.0).contains(&rate) {
             bail!(ebounds("Invalid rate"));
         }
 

sim/simflash/src/pdump.rs

diff --git a/sim/simflash/src/pdump.rs b/sim/simflash/src/pdump.rs
index c68aa83..6243065 100644
--- a/sim/simflash/src/pdump.rs
+++ b/sim/simflash/src/pdump.rs
@@ -34,7 +34,7 @@
             self.hex.push(' ');
         }
         self.hex.push_str(&format!(" {:02x}", ch)[..]);
-        self.ascii.push(if ch >= ' ' as u8 && ch <= '~' as u8 {
+        self.ascii.push(if (b' '..=b'~').contains(&ch) {
             ch as char
         } else {
             '.'