cargo: Move `extend` dependency to otter-base

We're going to want this there soon.

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

diff --git a/Cargo.lock b/Cargo.lock
index 73ac7205cab813dbb14bb7f592f71ed5f55d4256..6f8af030aa6b90bf9ab764d4c73219c2f5599a6e 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2104,7 +2104,6 @@ dependencies = [
  "enum-map",
  "enum_dispatch",
  "env_logger",
- "extend",
  "failure",
  "fehler",
  "flexi_logger",
@@ -2167,6 +2166,7 @@ version = "0.0.1"
 dependencies = [
  "arrayvec",
  "derive_more",
+ "extend",
  "fehler",
  "if_chain",
  "itertools",

diff --git a/Cargo.toml b/Cargo.toml
index 0a179917f78879e21c61a6518ddcac6640656cd7..4b8fcf5514fc3ba61c47118d9376233539c15ff0 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ downcast-rs="1"
 either="1"
 enum_dispatch="0.3.5"
 env_logger="0.8"
-extend="1"
 failure="0.1.8"
 fehler="1"
 fs2="0.4"

diff --git a/base/Cargo.toml b/base/Cargo.toml
index 11569b44acb4f9a481126b5e594f27db73be7b03..fc469fb89484765d98c7aa35b1d4daff23166383 100644 (file)
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -15,6 +15,7 @@ path = "lib.rs"
 
 arrayvec = "0.5"
 derive_more = "0.99"
+extend="1"
 if_chain = "1"
 itertools="0.10"
 num-derive="0.3"

diff --git a/base/imports.rs b/base/imports.rs
index 6cc107e4b180fb9a196f801557ef0a3f3a842b51..cc2bb839f1f42d95fb10c4b20cf7aa3fb144f66c 100644 (file)
--- a/base/imports.rs
+++ b/base/imports.rs
@@ -4,6 +4,7 @@
 
 pub use arrayvec;
 pub use derive_more;
+pub use extend;
 pub use if_chain;
 pub use itertools;
 pub use num_derive;

diff --git a/src/imports.rs b/src/imports.rs
index e13b31377ee9ff7b271dfbea472413c76675f657..0bd1ab06dfe5f51b4afff38cb77f77b23c7ad6b3 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -13,7 +13,6 @@ pub use chrono_tz;
 pub use delegate;
 pub use either;
 pub use env_logger;
-pub use extend;
 pub use failure;
 pub use flexi_logger;
 pub use fs2;