merge release/0.29 into master

* fix: fixed high cpu usage in follow mode on macos (#588)
pamburus · Dec 13, 2024 · 0198f9c · 0198f9c
2 parents 96349ce + f3a9642
commit 0198f9c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [master, release/*]
   pull_request:
-    branches: ['*']
+    branches: [master, release/*]
 
 jobs:
   test:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [".", "crate/encstr"]
 [workspace.package]
 repository = "https://github.com/pamburus/hl"
 authors = ["Pavel Ivanov <[email protected]>"]
-version = "0.30.0-alpha.1"
+version = "0.30.0-alpha.2"
 edition = "2021"
 license = "MIT"
 

diff --git a/src/fsmon.rs b/src/fsmon.rs
@@ -1,5 +1,5 @@
 // std imports
-use std::path::PathBuf;
+use std::{path::PathBuf, time::Duration};
 
 // local imports
 use crate::error::Result;
@@ -124,7 +124,7 @@ mod imp {
             watcher.watch()?;
 
             while synced {
-                let event = if let Some(event) = watcher.poll(None) {
+                let event = if let Some(event) = watcher.poll(Some(Duration::from_secs(1))) {
                     event
                 } else {
                     continue;