slotmap: Actually use our branch everywhere

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 35ee355b03d526a5023633ce5918e7dd4c965644..5c6138d28846ba4a7cc4b2684791d27c05448e34 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -2474,6 +2474,7 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 [[package]]
 name = "slotmap"
 version = "1.0.2"
+source = "git+https://github.com/ijackson/slotmap?branch=entry-return-stale-key#508ddf21d9d28dfd122e7abe195e0d0d824aea33"
 dependencies = [
  "serde",
  "version_check 0.9.2",

diff --git a/Cargo.nail b/Cargo.nail
index dcab5e8cc8d2a316004b6f39fa0ca6b8b86505b7..32ef8c3ece61b75fbe4f1ed37f7a2956820e4eb2 100644 (file)
--- a/Cargo.nail
+++ b/Cargo.nail
@@ -4,7 +4,6 @@
 
 subdirs = """
 server
-slotmap
 bundle-sources
 """
 

diff --git a/Cargo.toml b/Cargo.toml
index 934607e93630fbcf8fe67f84afa230eebdb2c7b6..c3f7c2d25d2ab2c5cccad0ccdcb6014ffdaac8b2 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,10 +57,6 @@ rmp-serde = "0.15"
 serde = { version = "1", features = ["derive","rc"] }
 serde_json = "1"
 serde_with = "1"
-
-slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
-# ^ MR not yet reviewed
-
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
@@ -71,3 +67,6 @@ typetag = "0.1.6"
 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

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index ab67ba343d541577591b68b5c939f175ed54323c..c48bc4f10bbc43b55569e061cc5a6bda0a61ad77 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -55,7 +55,6 @@ rmp-serde = "0.15"
 serde = { version = "1", features = ["derive","rc"] }
 serde_json = "1"
 serde_with = "1"
-slotmap = { version = "1", features = ['serde'] }
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
@@ -67,6 +66,9 @@ vecdeque-stableix = "1"
 rocket = { version = "^0.4.6", features=["sse"] }
 rocket_cors = "0.5"
 
+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