--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 11:13:05 2024 +0100
+++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 11:18:36 2024 +0100
@@ -14,11 +14,12 @@
     exc, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, PyNone, PyObject,
     PyResult, Python, PythonObject, ToPyObject, UnsafePyLeaked,
 };
-use hg::{
-    dirstate::dirstate_map::{
+use hg::dirstate::{
+    dirstate_map::{
         DirstateEntryReset, DirstateIdentity as CoreDirstateIdentity,
     },
-    dirstate::entry::{DirstateEntry, ParentFileData, TruncatedTimestamp},
+    entry::{DirstateEntry, ParentFileData, TruncatedTimestamp},
+    DirstateError,
 };
 
 use crate::{
@@ -30,8 +31,7 @@
     dirstate::dirstate_map::DirstateMapWriteMode,
     dirstate::on_disk::DirstateV2ParseError,
     dirstate::owning::OwningDirstateMap, dirstate::StateMapIter, revlog::Node,
-    utils::files::normalize_case, utils::hg_path::HgPath, DirstateError,
-    DirstateParents,
+    utils::files::normalize_case, utils::hg_path::HgPath, DirstateParents,
 };
 
 // TODO