--- a/rust/hg-cpython/src/dirstate/dirs_multiset.rs	Wed May 19 13:15:00 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dirs_multiset.rs	Wed May 19 13:15:00 2021 +0200
@@ -20,7 +20,8 @@
 use hg::{
     errors::HgError,
     utils::hg_path::{HgPath, HgPathBuf},
-    DirsMultiset, DirsMultisetIter, DirstateMapError, EntryState,
+    DirsMultiset, DirsMultisetIter, DirstateError, DirstateMapError,
+    EntryState,
 };
 
 py_class!(pub class Dirs |py| {
@@ -45,9 +46,9 @@
         }
         let inner = if let Ok(map) = map.cast_as::<PyDict>(py) {
             let dirstate = extract_dirstate(py, &map)?;
-            let dirstate = dirstate.iter().map(|(k, v)| (k, *v));
+            let dirstate = dirstate.iter().map(|(k, v)| Ok((k, *v)));
             DirsMultiset::from_dirstate(dirstate, skip_state)
-                .map_err(|e: DirstateMapError| {
+                .map_err(|e: DirstateError| {
                     PyErr::new::<exc::ValueError, _>(py, e.to_string())
                 })?
         } else {