--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs Mon Oct 11 22:19:42 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs Tue Oct 12 16:20:05 2021 +0200
@@ -330,9 +330,9 @@
pub(super) fn cached_directory_mtime(
&self,
- ) -> Option<&'tree on_disk::Timestamp> {
+ ) -> Option<crate::dirstate::Timestamp> {
match self {
- NodeRef::InMemory(_path, node) => match &node.data {
+ NodeRef::InMemory(_path, node) => match node.data {
NodeData::CachedDirectory { mtime } => Some(mtime),
_ => None,
},
@@ -376,7 +376,7 @@
pub(super) enum NodeData {
Entry(DirstateEntry),
- CachedDirectory { mtime: on_disk::Timestamp },
+ CachedDirectory { mtime: crate::dirstate::Timestamp },
None,
}