From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:41:27 +0000 (+0000)
Subject: Cannot centralise num-traits
X-Git-Tag: otter-0.4.0~462
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=73d4b3a282c7f522ecffd18966d55241dbe9439a;p=otter.git

Cannot centralise num-traits

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

diff --git a/Cargo.toml b/Cargo.toml
index 505f08dc..6ad1ef04 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,6 @@ num-derive = "0.3"
 ordered-float = "2"
 parking_lot = "0.11"
 
-num-traits = "0.2"
 percent-encoding = "2"
 pwd = "1"
 rand = "0.8"
@@ -65,6 +64,7 @@ vecdeque-stableix = "1"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
 thiserror = "1"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 0959eeca..c1acf3d5 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,7 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-num-traits = "0.2"
 percent-encoding = "2"
 pwd = "1"
 rand = "0.8"
@@ -38,6 +37,7 @@ rocket_cors = "0.5"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
 thiserror = "1"
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index ce787a3e..4db2495b 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -15,7 +15,6 @@ otter = { path = ".." }
 
 humantime = "2"
 ndarray = "0.14"
-num-traits = "0.2"
 once_cell = "1"
 regex = "1"
 serde_json = "1"
@@ -27,6 +26,7 @@ x11rb = "0.8"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
 
 [lib]