From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 22:49:16 +0000 (+0000)
Subject: Cannot centralise thiserror
X-Git-Tag: otter-0.4.0~481
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=95f01e2f5f3a3492c2bf25fd9b1893136e9b64df;p=otter.git

Cannot centralise thiserror

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

diff --git a/Cargo.toml b/Cargo.toml
index 792a4897..5f21ccfe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,6 @@ serde_json = "1"
 serde_with = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
-thiserror = "1"
 tempfile = "3"
 tera = "0.11"
 toml = "0.5"
@@ -67,6 +66,7 @@ vecdeque-stableix = "1"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+thiserror = "1"
 
 slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
 # ^ MR not yet reviewed
diff --git a/base/Cargo.toml b/base/Cargo.toml
index 22252487..26609983 100644
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -17,9 +17,9 @@ arrayvec = "0.5"
 derive_more = "0.99"
 if_chain = "1"
 
-thiserror = "1"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
 
 # Repeated in other Cargo.toml's because importing does not work properly
 fehler = "1"
+thiserror = "1"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 87f90417..1fa87f8a 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -55,7 +55,6 @@ serde_json = "1"
 serde_with = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
-thiserror = "1"
 toml = "0.5"
 typetag = "0.1.6"
 uds = "0.2"
@@ -66,6 +65,7 @@ rocket_cors = "0.5"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+thiserror = "1"
 
 slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
 # ^ MR not yet reviewed
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index 6c5438d5..cb4d976e 100644
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -18,9 +18,9 @@ otter-base = { path = "../base" }
 
 console_error_panic_hook = "0.1"
 js-sys = "0.3"
-thiserror = "1"
 wasm-bindgen = "0.2"
 wee_alloc = "0.4"
 
 # Repeated here because importing does not work properly
 fehler = "1"
+thiserror = "1"