From 2f06fcb7cfb8bfd16fbfb6f6ada215984c6b4c7e Mon Sep 17 00:00:00 2001 From: Kiril Videlov Date: Tue, 16 Jul 2024 15:51:15 +0200 Subject: [PATCH] upgrade mock_instant version --- Cargo.lock | 4 ++-- crates/gitbutler-watcher/vendor/debouncer/Cargo.toml | 2 +- crates/gitbutler-watcher/vendor/debouncer/src/event.rs | 2 +- crates/gitbutler-watcher/vendor/debouncer/src/lib.rs | 2 +- crates/gitbutler-watcher/vendor/debouncer/src/tests/mod.rs | 4 ++-- crates/gitbutler-watcher/vendor/debouncer/src/tests/schema.rs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7dd14241..08363da0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4190,9 +4190,9 @@ dependencies = [ [[package]] name = "mock_instant" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" +checksum = "cdcebb6db83796481097dedc7747809243cc81d9ed83e6a938b76d4ea0b249cf" [[package]] name = "native-tls" diff --git a/crates/gitbutler-watcher/vendor/debouncer/Cargo.toml b/crates/gitbutler-watcher/vendor/debouncer/Cargo.toml index cbda1792d..2c0da0452 100644 --- a/crates/gitbutler-watcher/vendor/debouncer/Cargo.toml +++ b/crates/gitbutler-watcher/vendor/debouncer/Cargo.toml @@ -19,7 +19,7 @@ file-id = "0.2.1" walkdir = "2.2.2" crossbeam-channel = "0.5.13" -mock_instant = { version = "0.3.2", optional = true } +mock_instant = { version = "0.5.1", optional = true } [dev-dependencies] gitbutler-notify-debouncer = { path = ".", features = ["mock_instant"] } diff --git a/crates/gitbutler-watcher/vendor/debouncer/src/event.rs b/crates/gitbutler-watcher/vendor/debouncer/src/event.rs index 0d35a3650..7f00be1c0 100644 --- a/crates/gitbutler-watcher/vendor/debouncer/src/event.rs +++ b/crates/gitbutler-watcher/vendor/debouncer/src/event.rs @@ -31,7 +31,7 @@ use std::ops::{Deref, DerefMut}; #[cfg(test)] -use mock_instant::Instant; +use mock_instant::thread_local::Instant; #[cfg(not(test))] use std::time::Instant; diff --git a/crates/gitbutler-watcher/vendor/debouncer/src/lib.rs b/crates/gitbutler-watcher/vendor/debouncer/src/lib.rs index c6def5350..7c64be365 100644 --- a/crates/gitbutler-watcher/vendor/debouncer/src/lib.rs +++ b/crates/gitbutler-watcher/vendor/debouncer/src/lib.rs @@ -59,7 +59,7 @@ use notify::{ use parking_lot::{MappedMutexGuard, Mutex, MutexGuard}; #[cfg(test)] -use mock_instant::Instant; +use mock_instant::thread_local::Instant; #[cfg(not(test))] use std::time::Instant; diff --git a/crates/gitbutler-watcher/vendor/debouncer/src/tests/mod.rs b/crates/gitbutler-watcher/vendor/debouncer/src/tests/mod.rs index 2852017cd..56c2b88f0 100644 --- a/crates/gitbutler-watcher/vendor/debouncer/src/tests/mod.rs +++ b/crates/gitbutler-watcher/vendor/debouncer/src/tests/mod.rs @@ -29,11 +29,11 @@ // DEALINGS IN THE SOFTWARE. use std::{path::Path, time::Duration}; -use mock_instant::Instant; +use mock_instant::thread_local::Instant; pub(crate) use schema::TestCase; -use mock_instant::MockClock; +use mock_instant::thread_local::MockClock; use pretty_assertions::assert_eq; use rstest::rstest; diff --git a/crates/gitbutler-watcher/vendor/debouncer/src/tests/schema.rs b/crates/gitbutler-watcher/vendor/debouncer/src/tests/schema.rs index 1dea71dcb..2891941bf 100644 --- a/crates/gitbutler-watcher/vendor/debouncer/src/tests/schema.rs +++ b/crates/gitbutler-watcher/vendor/debouncer/src/tests/schema.rs @@ -29,7 +29,7 @@ // DEALINGS IN THE SOFTWARE. use crate::{DebounceDataInner, DebouncedEvent}; use file_id::FileId; -use mock_instant::Instant; +use mock_instant::thread_local::Instant; use notify::event::{ AccessKind, AccessMode, CreateKind, DataChange, Flag, MetadataKind, ModifyKind, RemoveKind, RenameMode,