From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 31 Mar 2021 14:59:46 +0000 (+0100)
Subject: cargo: Move `extend` dependency to otter-base
X-Git-Tag: otter-0.5.0~356
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d4967224713fb345b86824ab93f7cb7cfba3f28f;p=otter.git

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 73ac7205..6f8af030 100644
--- 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 0a179917..4b8fcf55 100644
--- 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 11569b44..fc469fb8 100644
--- 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 6cc107e4..cc2bb839 100644
--- 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 e13b3137..0bd1ab06 100644
--- 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;