From 2a31fe1bff2472adbd3a4c4de3b5086d7778c650 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Thu, 16 Jun 2022 20:03:19 +0900
Subject: [PATCH 1/2] Clean-up CI config

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 .github/workflows/main.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2a8662bd..59cf4748 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,10 @@ jobs:
           - 1.56.0 # MSRV
           - stable
           - nightly
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -35,19 +38,27 @@ jobs:
           rustup override set ${{ matrix.version }}
 
       - name: check build
-        if: matrix.version != 'stable' && matrix.os == 'macos-latest'
+        if: matrix.version != '1.56.0' && matrix.os == 'macos-latest'
         run: cargo check --features=serde,macos_kqueue --examples
 
       - name: check build
-        if: matrix.version != 'stable' && matrix.os != 'macos-latest'
+        if: matrix.version == '1.56.0' && matrix.os == 'macos-latest'
+        run: cargo check --features=serde,macos_kqueue
+
+      - name: check build
+        if: matrix.version != '1.56.0' && matrix.os != 'macos-latest'
         run: cargo check --features=serde --examples
 
+      - name: check build
+        if: matrix.version == '1.56.0' && matrix.os != 'macos-latest'
+        run: cargo check --features=serde
+
       - name: check build example
-        if: matrix.version != 'stable'
+        if: matrix.version == 'stable'
         run: cargo check -p watcher_kind
 
       - name: test hot_reload_tide
-        if: matrix.version != 'stable'
+        if: matrix.version == 'stable'
         run: cargo test -p hot_reload_tide
 
       - name: test
@@ -61,7 +72,6 @@ jobs:
         target:
           - x86_64-unknown-netbsd
           - x86_64-unknown-freebsd
-          - x86_64-apple-darwin
     runs-on: ubuntu-latest
 
     steps:
@@ -72,12 +82,12 @@ jobs:
         run: |
           rustup set profile minimal
           rustup toolchain install stable --no-self-update
-          rustup target add ${{ matrix.target}}
+          rustup target add ${{ matrix.target }}
 
       - name: check build
         run: |
-          rustc --version && cargo --version  
-          cargo build --target ${{ matrix.target}}
+          rustc --version && cargo --version
+          cargo build --target ${{ matrix.target }}
 
   audit:
     runs-on: ubuntu-latest

From 55fcb1d10d4c7f0966509ac5b1f55343b3408c33 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Thu, 16 Jun 2022 20:03:38 +0900
Subject: [PATCH 2/2] Fix clippy warnings

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 src/poll.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/poll.rs b/src/poll.rs
index f9dd9ed1..f4cb6e61 100644
--- a/src/poll.rs
+++ b/src/poll.rs
@@ -53,7 +53,7 @@ mod data {
         {
             Self {
                 emitter: EventEmitter::new(event_handler),
-                build_hasher: compare_content.then(|| RandomState::default()),
+                build_hasher: compare_content.then(RandomState::default),
                 now: Instant::now(),
             }
         }
@@ -187,11 +187,11 @@ mod data {
         /// # Side Effect
         ///
         /// This function may emit some IO Error events by `data_builder.emitter`.
-        fn scan_all_path_data<'a>(
-            data_builder: &'a DataBuilder,
+        fn scan_all_path_data(
+            data_builder: &'_ DataBuilder,
             root: PathBuf,
             is_recursive: bool,
-        ) -> impl Iterator<Item = (PathBuf, PathData)> + 'a {
+        ) -> impl Iterator<Item = (PathBuf, PathData)> + '_ {
             // WalkDir return only one entry if root is a file (not a folder),
             // so we can use single logic to do the both file & dir's jobs.
             //
@@ -263,7 +263,7 @@ mod data {
             let metadata = meta_path.metadata();
 
             PathData {
-                mtime: FileTime::from_last_modification_time(&metadata).seconds(),
+                mtime: FileTime::from_last_modification_time(metadata).seconds(),
                 hash: data_builder
                     .build_hasher
                     .as_ref()
@@ -470,7 +470,9 @@ impl PollWatcher {
                     {
                         data_builder.update_timestamp();
 
-                        for watch_data in watches.values_mut() {
+
+                        let vals = watches.values_mut();
+                        for watch_data in vals {
                             watch_data.rescan(&mut data_builder);
                         }
                     }
@@ -523,7 +525,7 @@ impl PollWatcher {
             .unwrap()
             .remove(path)
             .map(|_| ())
-            .ok_or_else(|| crate::Error::watch_not_found())
+            .ok_or_else(crate::Error::watch_not_found)
     }
 }