--- a/rust/hg-core/src/dirstate.rs	Sun Sep 01 20:53:14 2019 +0200
+++ b/rust/hg-core/src/dirstate.rs	Sun Sep 01 20:53:14 2019 +0200
@@ -5,7 +5,7 @@
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
 
-use crate::DirstateParseError;
+use crate::{utils::hg_path::HgPathBuf, DirstateParseError};
 use std::collections::hash_map;
 use std::collections::HashMap;
 use std::convert::TryFrom;
@@ -31,10 +31,10 @@
     pub size: i32,
 }
 
-pub type StateMap = HashMap<Vec<u8>, DirstateEntry>;
-pub type StateMapIter<'a> = hash_map::Iter<'a, Vec<u8>, DirstateEntry>;
-pub type CopyMap = HashMap<Vec<u8>, Vec<u8>>;
-pub type CopyMapIter<'a> = hash_map::Iter<'a, Vec<u8>, Vec<u8>>;
+pub type StateMap = HashMap<HgPathBuf, DirstateEntry>;
+pub type StateMapIter<'a> = hash_map::Iter<'a, HgPathBuf, DirstateEntry>;
+pub type CopyMap = HashMap<HgPathBuf, HgPathBuf>;
+pub type CopyMapIter<'a> = hash_map::Iter<'a, HgPathBuf, HgPathBuf>;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum EntryState {