Fix clippy warnings

dbrgn · Dec 26, 2023 · 703ece9 · 703ece9
1 parent 3b37b60
commit 703ece9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,10 +40,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.74.1
         with:
           components: clippy
-      - run: cargo clippy --all-features
+      - run: cargo clippy --all-features -- -D warnings
 
   rustfmt:
     name: Rustfmt

diff --git a/src/types.rs b/src/types.rs
@@ -78,7 +78,7 @@ impl Humidity {
             return Err(HumidityError::OutOfRange);
         }
 
-        let integer = if val >= 256.0 || val < 0.0 {
+        let integer = if !(0.0..256.0).contains(&val) {
             return Err(HumidityError::OutOfRange);
         } else {
             val.trunc() as u8
@@ -103,10 +103,10 @@ impl Humidity {
     }
 }
 
-impl Into<f32> for Humidity {
+impl From<Humidity> for f32 {
     /// Convert a `Humidity` instance to a f32.
-    fn into(self) -> f32 {
-        f32::from(self.integer) + (f32::from(self.fractional) / 256.0)
+    fn from(val: Humidity) -> Self {
+        f32::from(val.integer) + (f32::from(val.fractional) / 256.0)
     }
 }