Centralise thiserror

Yes, we can, if we do it right

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 9a6200ae32f0ae282fe7ec95da258889e244e63c..f5695012cb9f0f98f59c6eae19c0e38bf44e316f 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1625,7 +1625,6 @@ dependencies = [
  "strum",
  "tempfile",
  "tera",
- "thiserror",
  "toml 0.5.8",
  "typetag",
  "uds",
@@ -1662,7 +1661,6 @@ dependencies = [
  "serde_with",
  "structopt",
  "strum",
- "thiserror",
 ]
 
 [[package]]
@@ -1673,7 +1671,6 @@ dependencies = [
  "fehler",
  "js-sys",
  "otter-base",
- "thiserror",
  "wasm-bindgen",
  "wee_alloc",
 ]

diff --git a/Cargo.toml b/Cargo.toml
index d0b1d5f61d94ec7ff444254ba0b1e98af30a6fde..47256d7e386fd656a000ee8a59996ba0547a6a92 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,4 +74,3 @@ serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
-thiserror = "1"

diff --git a/base/imports.rs b/base/imports.rs
index 9f3e3cc66fe8a3bf355d94406a847caf41a6ad25..3475488a4fc5e39f5c3dd9b98e65706f82781a8d 100644 (file)
--- a/base/imports.rs
+++ b/base/imports.rs
@@ -5,3 +5,4 @@
 pub use arrayvec;
 pub use derive_more;
 pub use if_chain;
+pub use thiserror;

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 5eecdad1eb657e4920f20e3ac316ec3d96a1d513..525163434c024cbf9f255ba9dcdf64442d95f56e 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -28,7 +28,6 @@ serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
-thiserror = "1"
 
 [dependencies.rocket_contrib]
 version = "0.4"

diff --git a/daemon/main.rs b/daemon/main.rs
index 51552460ebceb776c1e4df37e7a58938d13b59a5..db036cdd907086cf169014e3bc91766d5f4f87d9 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -4,6 +4,8 @@
 
 #![feature(proc_macro_hygiene, decl_macro)]
 
+use otter::imports::thiserror;
+
 pub mod imports;
 
 pub mod api;

diff --git a/src/prelude.rs b/src/prelude.rs
index d20a432eaa198197d598ecbceb06f71d995bb31a..0fd99fbcb1ae65e132fbe26b67efaa4f848bf775 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -4,7 +4,7 @@
 
 use crate::imports::*;
 
-pub use crate::imports::flexi_logger;
+pub use crate::imports::{flexi_logger, thiserror};
 
 pub use std::any::Any;
 pub use std::borrow::Borrow;

diff --git a/src/spec.rs b/src/spec.rs
index 1d6ee23eebf1f4951f5595f8858c9f5f30cc8f50..ced7564ef4adc9c56e48af7e15ee1e565cb803fc 100644 (file)
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -4,6 +4,8 @@
 
 // game specs
 
+use crate::imports::*;
+
 use std::collections::hash_map::HashMap;
 use std::collections::hash_set::HashSet;
 use std::fmt::Debug;

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index cb4d976e4a1c08a56493de4a5c0bb76a77b49d7d..139a2f5b28dbc6afde9d41e2b2271b4a556398ba 100644 (file)
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -23,4 +23,3 @@ wee_alloc = "0.4"
 
 # Repeated here because importing does not work properly
 fehler = "1"
-thiserror = "1"

diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index 9a30b415e082f62dc0faa31e05a4a94958878405..667706618b547c73f406884000ec140fb2e4f582 100644 (file)
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use otter_base::imports::*;
+
 use std::fmt::Display;
 
 use fehler::throws;