From 0f7f0ace93471160efabc08621ebabb56a3e21c8 Mon Sep 17 00:00:00 2001
From: IsseW <isidornie@gmail.com>
Date: Tue, 1 Feb 2022 01:20:00 +0100
Subject: [PATCH] Use DHashMap

---
 world/src/civ/mod.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs
index 6f4afae220..3319834a4b 100644
--- a/world/src/civ/mod.rs
+++ b/world/src/civ/mod.rs
@@ -7,7 +7,7 @@ use crate::{
     sim::WorldSim,
     site::{namegen::NameGen, Castle, Settlement, Site as WorldSite, Tree},
     site2,
-    util::{attempt, seed_expan, DHashSet, NEIGHBORS},
+    util::{attempt, seed_expan, DHashMap, DHashSet, NEIGHBORS},
     Index, Land,
 };
 use common::{
@@ -20,7 +20,6 @@ use common::{
 };
 use core::{fmt, hash::BuildHasherDefault, ops::Range};
 use fxhash::FxHasher64;
-use hashbrown::HashMap;
 use rand::prelude::*;
 use rand_chacha::ChaChaRng;
 use tracing::{debug, info, warn};
@@ -50,11 +49,7 @@ pub struct Civs {
     /// (1) we don't care about DDOS attacks (ruling out SipHash);
     /// (2) we care about determinism across computers (ruling out AAHash);
     /// (3) we have 8-byte keys (for which FxHash is fastest).
-    pub track_map: HashMap<
-        Id<Site>,
-        HashMap<Id<Site>, Id<Track>, BuildHasherDefault<FxHasher64>>,
-        BuildHasherDefault<FxHasher64>,
-    >,
+    pub track_map: DHashMap<Id<Site>, DHashMap<Id<Site>, Id<Track>>>,
 
     pub sites: Store<Site>,
     pub caves: Store<CaveInfo>,