From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:59:26 +0000 (+0000)
Subject: Centralise slotmap
X-Git-Tag: otter-0.4.0~454
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=308ff60c5b3f3c2f0b2cd34ee6ae4706ec7b751f;p=otter.git

Centralise slotmap

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index d3aa1f17..91fbc00c 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1658,7 +1658,6 @@ dependencies = [
  "rocket_cors",
  "serde",
  "serde_with",
- "slotmap",
  "structopt",
  "strum",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index 0be26cae..261adce9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,9 @@ uds = "0.2"
 url = "2"
 vecdeque-stableix = "1"
 
+slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
+# ^ MR not yet reviewed
+
 # This version wants to stay aligned with Rocket's, or we'll hve
 # two copies of the templating engine in our executables!
 tera = "0.11"
@@ -70,6 +73,3 @@ serde_with = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
-
-slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
-# ^ MR not yet reviewed
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index b6c852a7..5eecdad1 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -30,9 +30,6 @@ structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
 
-slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
-# ^ MR not yet reviewed
-
 [dependencies.rocket_contrib]
 version = "0.4"
 default-features = false
diff --git a/src/imports.rs b/src/imports.rs
index ec565bf6..1477c9f4 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -30,6 +30,7 @@ pub use pwd;
 pub use regex;
 pub use rmp_serde;
 pub use serde_json;
+pub use slotmap;
 pub use toml;
 pub use uds;
 pub use vecdeque_stableix;