mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-25 07:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Assign fake fs entries' mtimes more consistently

Browse source
This commit is contained in:
Max Brunsfeld 2023-01-02 10:20:52 -08:00
parent f3dee2d332
commit 74843493f4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/fs/src/fs.rs
View file

@ -518,7 +518,7 @@ impl FakeFs {
state: Mutex::new(FakeFsState { state: Mutex::new(FakeFsState {
root: Arc::new(Mutex::new(FakeFsEntry::Dir { root: Arc::new(Mutex::new(FakeFsEntry::Dir {
inode: 0, inode: 0,
mtime: SystemTime::now(), mtime: SystemTime::UNIX_EPOCH,
entries: Default::default(), entries: Default::default(),
git_repo_state: None, git_repo_state: None,
})), })),
@ -535,7 +535,7 @@ impl FakeFs {
let inode = state.next_inode; let inode = state.next_inode;
let mtime = state.next_mtime; let mtime = state.next_mtime;
state.next_inode += 1; state.next_inode += 1;
state.next_mtime += Duration::from_millis(1); state.next_mtime += Duration::from_nanos(1);
let file = Arc::new(Mutex::new(FakeFsEntry::File { let file = Arc::new(Mutex::new(FakeFsEntry::File {
inode, inode,
mtime, mtime,
@ -745,6 +745,8 @@ impl Fs for FakeFs {
} }
let inode = state.next_inode; let inode = state.next_inode;
let mtime = state.next_mtime;
state.next_mtime += Duration::from_nanos(1);
state.next_inode += 1; state.next_inode += 1;
state state
.write_path(&cur_path, |entry| { .write_path(&cur_path, |entry| {
@ -752,7 +754,7 @@ impl Fs for FakeFs {
created_dirs.push(cur_path.clone()); created_dirs.push(cur_path.clone());
Arc::new(Mutex::new(FakeFsEntry::Dir { Arc::new(Mutex::new(FakeFsEntry::Dir {
inode, inode,
mtime: SystemTime::now(), mtime,
entries: Default::default(), entries: Default::default(),
git_repo_state: None, git_repo_state: None,
})) }))
@ -770,10 +772,12 @@ impl Fs for FakeFs {
self.simulate_random_delay().await; self.simulate_random_delay().await;
let mut state = self.state.lock().await; let mut state = self.state.lock().await;
let inode = state.next_inode; let inode = state.next_inode;
let mtime = state.next_mtime;
state.next_mtime += Duration::from_nanos(1);
state.next_inode += 1; state.next_inode += 1;
let file = Arc::new(Mutex::new(FakeFsEntry::File { let file = Arc::new(Mutex::new(FakeFsEntry::File {
inode, inode,
mtime: SystemTime::now(), mtime,
content: String::new(), content: String::new(),
})); }));
state state
@ -837,7 +841,7 @@ impl Fs for FakeFs {
let mut state = self.state.lock().await; let mut state = self.state.lock().await;
let mtime = state.next_mtime; let mtime = state.next_mtime;
let inode = post_inc(&mut state.next_inode); let inode = post_inc(&mut state.next_inode);
state.next_mtime += Duration::from_millis(1); state.next_mtime += Duration::from_nanos(1);
let source_entry = state.read_path(&source).await?; let source_entry = state.read_path(&source).await?;
let content = source_entry.lock().await.file_content(&source)?.clone(); let content = source_entry.lock().await.file_content(&source)?.clone();
let entry = state let entry = state