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 c4b0fb3d887deccb8cbe6d81a0e87497e06b4692..74fa34bd753fe1f3c550b2d56af7f610d2ee968b 100644 (file)
--- 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 2189118b5e11dffa2a695a1cc3a92fd975cc8bde..595323cddcde1ccf13d60d47f21eec0a0c57b7f1 100644 (file)
--- 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 dba701412e5da931f99b4621397b8986930c7c07..e86379af31793ef5e834f989e2e8de0d7f2c2300 100644 (file)
--- 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 0a3478c7946313a44902011a6eea61574d8d07dd..111c5189dc6eca5a0d4123c34c64a0d68f260952 100644 (file)
--- 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 870188427988f998123edbbd385ffd5399343d8e..f5a129f20d5ccd45854d83d2348ef88e7be2e91f 100644 (file)
--- 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;