Centralise slotmap

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index d3aa1f175ecb41a4c6f41c8125f2ae4c06f0c46f..91fbc00c08ec62970d627533839e0c7016fbc908 100644 (file)
--- 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 0be26cae62b47bdcf1314706f4d4c4df04b333c5..261adce940d61c5147c3ead78f97265e9c4c6d6d 100644 (file)
--- 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 b6c852a7f07fc38e733039fdb0772c1871668309..5eecdad1eb657e4920f20e3ac316ec3d96a1d513 100644 (file)
--- 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 ec565bf67e9db945b64053cfbc19247f6dea2e75..1477c9f4aed7c554fb7f9ca2851f9394fae60c8e 100644 (file)
--- 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;