From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 22:39:49 +0000 (+0000)
Subject: Centralise derive_more
X-Git-Tag: otter-0.4.0~484
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=423d4ec43ed8cca556376d81f506d87d11d67218;p=otter.git

Centralise derive_more

This proves that the new scheme works

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index c4b0fb3d..74fa34bd 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1587,7 +1587,6 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "delegate",
- "derive_more",
  "downcast-rs",
  "either",
  "enum-map",
@@ -1658,7 +1657,6 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "delegate",
- "derive_more",
  "either",
  "failure",
  "fehler",
diff --git a/Cargo.toml b/Cargo.toml
index 2189118b..595323cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ boolinator = "2"
 chrono = "0.4"
 chrono-tz = "0.5"
 delegate = "0.5"
-derive_more = "0.99"
 downcast-rs = "1"
 either = "1"
 enum-map = { version = "0.6", features = [ "serde" ] }
diff --git a/base/imports.rs b/base/imports.rs
index dba70141..e86379af 100644
--- a/base/imports.rs
+++ b/base/imports.rs
@@ -3,3 +3,4 @@
 // There is NO WARRANTY.
 
 pub use arrayvec;
+pub use derive_more;
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 0a3478c7..111c5189 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -25,7 +25,6 @@ boolinator = "2"
 chrono = "0.4"
 chrono-tz = "0.5"
 delegate = "0.5"
-derive_more = "0.99"
 either = "1"
 failure = "0.1.8" # for pwd
 fehler = "1"
diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 87018842..f5a129f2 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -4,6 +4,8 @@
 
 #![allow(unused_imports)]
 
+use otter::imports::*;
+
 use std::cell::Cell;
 use std::cell::RefCell;
 use std::rc::Rc;