From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:40:31 +0000 (+0000)
Subject: Centralise ordered-float parking_lot
X-Git-Tag: otter-0.4.0~463
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=711dc85a90466ea4e7d51a229d134cb4fcd00fde;p=otter.git

Centralise ordered-float parking_lot

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 7fc4a0df..4065d190 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1651,10 +1651,8 @@ version = "0.0.1"
 dependencies = [
  "fehler",
  "num-traits",
- "ordered-float",
  "otter",
  "otter-base",
- "parking_lot",
  "percent-encoding 2.1.0",
  "pwd",
  "rand 0.8.3",
@@ -1700,7 +1698,6 @@ dependencies = [
  "num-traits",
  "once_cell",
  "otter",
- "parking_lot",
  "regex",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index d81afc87..505f08dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,10 +42,10 @@ libc = "0.2"
 log = "0.4"
 nix = "0.19"
 num-derive = "0.3"
-
-num-traits = "0.2"
 ordered-float = "2"
 parking_lot = "0.11"
+
+num-traits = "0.2"
 percent-encoding = "2"
 pwd = "1"
 rand = "0.8"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 60be2514..0959eeca 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -19,8 +19,6 @@ otter = { path = ".." }
 otter-base = { path = "../base" }
 
 num-traits = "0.2"
-ordered-float = "2"
-parking_lot = "0.11"
 percent-encoding = "2"
 pwd = "1"
 rand = "0.8"
diff --git a/src/imports.rs b/src/imports.rs
index 0ff1e328..476e830f 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -24,3 +24,6 @@ pub use libc;
 pub use log;
 pub use nix;
 pub use num_derive;
+pub use ordered_float;
+pub use parking_lot;
+
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 20ab7a87..ce787a3e 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -17,7 +17,6 @@ humantime = "2"
 ndarray = "0.14"
 num-traits = "0.2"
 once_cell = "1"
-parking_lot = "0.11"
 regex = "1"
 serde_json = "1"
 structopt = "0.3"