--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 10:38:17 2024 +0100
+++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 11:00:58 2024 +0100
@@ -15,10 +15,10 @@
     PyResult, Python, PythonObject, ToPyObject, UnsafePyLeaked,
 };
 use hg::{
-    dirstate::{ParentFileData, TruncatedTimestamp},
-    dirstate_tree::dirstate_map::{
+    dirstate::dirstate_map::{
         DirstateEntryReset, DirstateIdentity as CoreDirstateIdentity,
     },
+    dirstate::{ParentFileData, TruncatedTimestamp},
 };
 
 use crate::{
@@ -27,9 +27,9 @@
     pybytes_deref::PyBytesDeref,
 };
 use hg::{
-    dirstate::StateMapIter, dirstate_tree::dirstate_map::DirstateMapWriteMode,
-    dirstate_tree::on_disk::DirstateV2ParseError,
-    dirstate_tree::owning::OwningDirstateMap, revlog::Node,
+    dirstate::dirstate_map::DirstateMapWriteMode,
+    dirstate::on_disk::DirstateV2ParseError,
+    dirstate::owning::OwningDirstateMap, dirstate::StateMapIter, revlog::Node,
     utils::files::normalize_case, utils::hg_path::HgPath, DirstateEntry,
     DirstateError, DirstateParents,
 };