From b8ffa0c38a0a4b299efccb2a38ef144c098731c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Sat, 29 Jan 2022 01:54:03 +1300 Subject: [PATCH] Formatting --- lib/src/filter/globset.rs | 5 +++-- lib/tests/filter_globset.rs | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/src/filter/globset.rs b/lib/src/filter/globset.rs index 499910d..0e65a42 100644 --- a/lib/src/filter/globset.rs +++ b/lib/src/filter/globset.rs @@ -109,7 +109,7 @@ impl Filterer for GlobsetFilterer { return Ok(false); } } - + let mut paths = event.paths().peekable(); if paths.peek().is_none() { trace!("non-path event (pass)"); @@ -126,7 +126,8 @@ impl Filterer for GlobsetFilterer { return false; } - if self.filters.num_ignores() > 0 && !self.filters.matched(path, is_dir).is_ignore() { + if self.filters.num_ignores() > 0 && !self.filters.matched(path, is_dir).is_ignore() + { trace!("ignored by globset filters"); return false; } diff --git a/lib/tests/filter_globset.rs b/lib/tests/filter_globset.rs index 33c935b..b4e38c2 100644 --- a/lib/tests/filter_globset.rs +++ b/lib/tests/filter_globset.rs @@ -350,21 +350,25 @@ async fn multipath_allow_on_any_one_pass() { #[tokio::test] async fn nonpath_event_passes() { use watchexec::{ - event::{Event, Tag, Source}, + event::{Event, Source, Tag}, filter::Filterer, }; let filterer = filt(&[], &[], &["py"]).await; - assert!(filterer.check_event(&Event { - tags: vec![Tag::Source(Source::Internal)], - metadata: Default::default(), - }).unwrap()); + assert!(filterer + .check_event(&Event { + tags: vec![Tag::Source(Source::Internal)], + metadata: Default::default(), + }) + .unwrap()); - assert!(filterer.check_event(&Event { - tags: vec![Tag::Source(Source::Keyboard)], - metadata: Default::default(), - }).unwrap()); + assert!(filterer + .check_event(&Event { + tags: vec![Tag::Source(Source::Keyboard)], + metadata: Default::default(), + }) + .unwrap()); } // The following tests replicate the "buggy"/"confusing" watchexec v1 behaviour.