Reorganose dependencies: wip, arrayvec

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 2948fd175812898fa803059bb96f65bbd08304b5..c4b0fb3d887deccb8cbe6d81a0e87497e06b4692 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1582,7 +1582,6 @@ version = "0.3.0"
 dependencies = [
  "anyhow",
  "argparse",
- "arrayvec",
  "backtrace",
  "boolinator",
  "chrono",

diff --git a/Cargo.toml b/Cargo.toml
index 8bdc4e78fd18998a24dda251fbb5444a5cbd2630..2189118b5e11dffa2a695a1cc3a92fd975cc8bde 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,6 @@ otter-base = { path = "base" }
 
 anyhow = "1"
 argparse = "0.2"
-arrayvec = "0.5"
 backtrace = "0.3"
 boolinator = "2"
 chrono = "0.4"

diff --git a/base/imports.rs b/base/imports.rs
new file mode 100644 (file)
index 0000000..dba7014
--- /dev/null
+++ b/base/imports.rs
@@ -0,0 +1,5 @@
+// Copyright 2020-2021 Ian Jackson and contributors to Otter
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
+pub use arrayvec;

diff --git a/base/lib.rs b/base/lib.rs
index 223d3c0a16ced5cff5293224edd8ab02aa06380c..e1b58a16bfbbea74718abef65ad16d628fd0f239 100644 (file)
--- a/base/lib.rs
+++ b/base/lib.rs
@@ -2,5 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+pub mod imports;
+
 pub mod zcoord;
 pub mod misc;

diff --git a/src/imports.rs b/src/imports.rs
index 778f19734b578d8989816f1b9639fef8ef751648..d08f15f667770198cdcb92f1acc494c1381c8b30 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -2,4 +2,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+pub use otter_base::imports::*;
+
 pub use anyhow;

diff --git a/src/prelude.rs b/src/prelude.rs
index 6632643dbe2adae3bf993734e9683a3a3ff312cf..fa9c4f3c9885321c452515ea916dcd74c0085a02 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use crate::imports::*;
+
 pub use std::any::Any;
 pub use std::borrow::Borrow;
 pub use std::borrow::Cow;

diff --git a/src/utils.rs b/src/utils.rs
index 43e4e472fd1acc690ef6931843ae4e16bf2f7fec..f1916866e3dbccbc9a18835bc9df4e63ed35e2ac 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use crate::imports::*;
+
 use std::fmt::{self, Debug};
 use std::fs;
 use std::io;