Merge pull request #35 from musicinmybrain/inotify-0.11

Update inotify dependency from 0.10.0 to 0.11.0

Cargo.toml

@@ -23,7 +23,7 @@ anyhow = "1.0.65"
 cfg-if = "1.0.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-inotify = "0.10.0" # Watch files and auto-reload on changes
+inotify = "0.11.0" # Watch files and auto-reload on changes
 
 [target.'cfg(any(target_os="macos", target_os="dragonfly", target_os="freebsd", target_os="netbsd", target_os="openbsd"))'.dependencies]
 kqueue = "1.0.6" # Watch files and auto-reload on changes

src/file_watcher/inotify.rs

@@ -16,10 +16,7 @@ pub struct FileWatchImpl {
 
 impl FileWatcherImpl {
     pub fn init() -> Result<FileWatcherImpl> {
-        let ino = match Inotify::init() {
-            Ok(i) => i,
-            Err(msg) => return Result::Err(msg),
-        };
+        let ino = Inotify::init()?;
 
         Result::Ok(FileWatcherImpl {
             inotify: ino,
@@ -30,15 +27,11 @@ impl FileWatcherImpl {
     pub fn add_watch(&mut self, file_path: &PathBuf) -> Result<&FileWatchImpl> {
         let mask: inotify::WatchMask = inotify::WatchMask::MODIFY;
 
-        let watch = match self.inotify.watches().add(file_path, mask) {
-            Ok(w) => w,
-            Err(msg) => return Result::Err(msg),
-        };
-
+        let watch = self.inotify.watches().add(file_path, mask)?;
         let fw = FileWatchImpl { descriptor: watch };
 
         self.watches.push(fw);
-        return Result::Ok(self.watches.last().unwrap());
+        Result::Ok(self.watches.last().unwrap())
     }
 
     pub fn rm_watch(&mut self, fw: &FileWatchImpl) -> Result<()> {
@@ -62,10 +55,7 @@ impl FileWatcherImpl {
 
     pub fn any_events(&mut self) -> Result<bool> {
         let mut buffer = [0; 1024];
-        let events = match self.inotify.read_events(&mut buffer) {
-            Result::Ok(ev) => ev,
-            Result::Err(err) => return Result::Err(err),
-        };
+        let events = self.inotify.read_events(&mut buffer)?;
 
         Result::Ok(events.count() > 0)
     }

src/file_watcher/kqueue.rs

@@ -20,10 +20,7 @@ pub struct FileWatchImpl {
 
 impl FileWatcherImpl {
     pub fn init() -> Result<FileWatcherImpl> {
-        let kq = match KQueue::new() {
-            Ok(value) => value,
-            Err(msg) => return Result::Err(msg),
-        };
+        let kq = KQueue::new()?;
 
         Ok(FileWatcherImpl {
             kq,

src/ui/tui.rs

@@ -340,7 +340,7 @@ impl<'a> Tui<'a> {
     }
 }
 
-impl<'a> UiAgent for Tui<'a> {
+impl UiAgent for Tui<'_> {
     fn start(mut self) -> Result<ApplicationExitReason> {
         // Setup event loop and input handling
         let (tx, rx) = mpsc::channel();