Skip to content

Commit

Permalink
Fix compatibility with rust 1.56
Browse files Browse the repository at this point in the history
  • Loading branch information
dfaust committed May 9, 2023
1 parent cbe3d02 commit 0a6b495
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions examples/debounced.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fn main() {
// print all events, non returning
for result in rx {
match result {
Ok(events) => events.iter().for_each(|event| println!("{event:?}")),
Err(errors) => errors.iter().for_each(|error| println!("{error:?}")),
Ok(events) => events.iter().for_each(|event| println!("{:?}", event)),
Err(errors) => errors.iter().for_each(|error| println!("{:?}", error)),
}
}
}
4 changes: 2 additions & 2 deletions examples/debounced_full_custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ fn main() {
// print all events, non returning
for result in rx {
match result {
Ok(events) => events.iter().for_each(|event| println!("{event:?}")),
Err(errors) => errors.iter().for_each(|error| println!("{error:?}")),
Ok(events) => events.iter().for_each(|event| println!("{:?}", event)),
Err(errors) => errors.iter().for_each(|error| println!("{:?}", error)),
}
}
}
8 changes: 4 additions & 4 deletions examples/debounced_refined.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// emit some events by changing a file
thread::spawn(move || {
let mut n = 1;
let mut file_path = dir_path.join(format!("file-{n:03}.txt"));
let mut file_path = dir_path.join(format!("file-{:03}.txt", n));
loop {
for _ in 0..5 {
fs::write(&file_path, b"Lorem ipsum").unwrap();
thread::sleep(Duration::from_millis(500));
}
n += 1;
let target_path = dir_path.join(format!("file-{n:03}.txt"));
let target_path = dir_path.join(format!("file-{:03}.txt", n));
fs::rename(&file_path, &target_path).unwrap();
file_path = target_path;
}
Expand All @@ -41,8 +41,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// print all events and errors
for result in rx {
match result {
Ok(events) => events.iter().for_each(|event| println!("{event:?}")),
Err(errors) => errors.iter().for_each(|error| println!("{error:?}")),
Ok(events) => events.iter().for_each(|event| println!("{:?}", event)),
Err(errors) => errors.iter().for_each(|error| println!("{:?}", error)),
}
println!();
}
Expand Down
2 changes: 1 addition & 1 deletion file-id/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//!
//! let file_id = file_id::get_file_id(file.path()).unwrap();
//!
//! println!("{file_id:?}");
//! println!("{:?}", file_id);
//! ```
use std::{fs, io, path::Path};

Expand Down
2 changes: 1 addition & 1 deletion notify-debouncer-refined/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ parking_lot = "0.12.1"
[dev-dependencies]
pretty_assertions = "1.3.0"
mock_instant = "0.3.0"
rstest = "0.17.0"
rstest = "0.12.0"
serde = { version = "1.0.89", features = ["derive"] }
deser-hjson = "1.1.1"
rand = "0.8.5"
13 changes: 7 additions & 6 deletions notify-debouncer-refined/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
//! // Using a callback here, could also be a channel.
//! let mut debouncer = new_debouncer(Duration::from_secs(2), None, |result: DebounceEventResult| {
//! match result {
//! Ok(events) => events.iter().for_each(|event| println!("{event:?}")),
//! Err(errors) => errors.iter().for_each(|error| println!("{error:?}")),
//! Ok(events) => events.iter().for_each(|event| println!("{:?}", event)),
//! Err(errors) => errors.iter().for_each(|error| println!("{:?}", error)),
//! }
//! }).unwrap();
//!
Expand Down Expand Up @@ -106,8 +106,8 @@ use std::time::Instant;
/// impl DebounceEventHandler for EventPrinter {
/// fn handle_event(&mut self, result: DebounceEventResult) {
/// match result {
/// Ok(events) => events.iter().for_each(|event| println!("{event:?}")),
/// Err(errors) => errors.iter().for_each(|error| println!("{error:?}")),
/// Ok(events) => events.iter().for_each(|event| println!("{:?}", event)),
/// Err(errors) => errors.iter().for_each(|error| println!("{:?}", error)),
/// }
/// }
/// }
Expand Down Expand Up @@ -697,7 +697,7 @@ mod tests {
file_name: &str,
) {
let file_content =
fs::read_to_string(Path::new(&format!("./test_cases/{file_name}.hjson"))).unwrap();
fs::read_to_string(Path::new(&format!("./test_cases/{}.hjson", file_name))).unwrap();
let mut test_case = deser_hjson::from_str::<TestCase>(&file_content).unwrap();

MockClock::set_time(Duration::default());
Expand Down Expand Up @@ -780,7 +780,8 @@ mod tests {
assert_eq!(
state.debounced_events(),
events,
"debounced events after a `{delay}` delay"
"debounced events after a `{}` delay",
delay
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion notify-debouncer-refined/src/testing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl schema::Event {
for f in self.flags {
let flag = match &*f {
"rescan" => Flag::Rescan,
_ => panic!("unknown event flag `{f}`"),
_ => panic!("unknown event flag `{}`", f),
};

event = event.set_flag(flag);
Expand Down

0 comments on commit 0a6b495

Please sign in to comment.