Centralise flexi_logger fs2 glob htmlescape

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index d1df1e764c8f9ea6dffbc16626242c0bcf3c02f3..67a405d62a782ff6d2208b869fa4cf5c1c86caa6 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1650,10 +1650,6 @@ name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "flexi_logger",
- "fs2",
- "glob 0.3.0",
- "htmlescape",
  "index_vec",
  "inventory",
  "itertools",

diff --git a/Cargo.toml b/Cargo.toml
index 81eb81af5fdbfd9f42156d1bd6992848596d25d0..6f8e2b6f3facdd801a9d3f09b09f5d3c8d18b340 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,11 +29,11 @@ either = "1"
 enum-map = { version = "0.6", features = [ "serde" ] }
 env_logger = "0.8"
 failure = "0.1.8" # for pwd
-
 flexi_logger = { version = "0.17", features = [ "specfile" ] }
 fs2 = "0.4"
 glob = "0.3"
 htmlescape = "0.3"
+
 index_vec = { version = "0.1.1", features = ['serde'] }
 inventory = "0.1"
 itertools = "0.10"

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 6697ed4678fdc739ace144a16a4a1abc437555c7..cddb51fc45632bd20dd4090b4b25a5006b3ee8a6 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,10 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-flexi_logger = { version = "0.17", features = [ "specfile" ] }
-fs2 = "0.4"
-glob = "0.3"
-htmlescape = "0.3"
 index_vec = { version = "0.1.1", features = ['serde'] }
 inventory = "0.1"
 itertools = "0.10"

diff --git a/daemon/api.rs b/daemon/api.rs
index dd2f04fa702f20e403661ab9fdaee45b2058f177..98a3c6e1ab04a2c493d4e3ad08b50030adb3c9f3 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use crate::imports::*;
+
 pub use super::*;
 
 type PL = PresentationLayout;

diff --git a/daemon/imports.rs b/daemon/imports.rs
new file mode 100644 (file)
index 0000000..35e5c4f
--- /dev/null
+++ b/daemon/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 otter::imports::*;

diff --git a/daemon/main.rs b/daemon/main.rs
index dfe1f6c510d16f92112ac1f58d5db2b4a584ab01..51552460ebceb776c1e4df37e7a58938d13b59a5 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -4,6 +4,8 @@
 
 #![feature(proc_macro_hygiene, decl_macro)]
 
+pub mod imports;
+
 pub mod api;
 pub mod cmdlistener;
 pub mod session;

diff --git a/src/imports.rs b/src/imports.rs
index cbd895a5630f640a301a7d60115a523006e2f3b7..ea9cd1ad85c6f1523fc6917c3c823518ef7d12ff 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -12,3 +12,7 @@ pub use delegate;
 pub use either;
 pub use env_logger;
 pub use failure;
+pub use flexi_logger;
+pub use fs2;
+pub use glob;
+pub use htmlescape;

diff --git a/src/prelude.rs b/src/prelude.rs
index fa9c4f3c9885321c452515ea916dcd74c0085a02..dc9d269fa3b6e34775e3b575c66a32952d5c900d 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -4,6 +4,8 @@
 
 use crate::imports::*;
 
+pub use crate::imports::flexi_logger;
+
 pub use std::any::Any;
 pub use std::borrow::Borrow;
 pub use std::borrow::Cow;
@@ -54,7 +56,7 @@ pub use downcast_rs::{impl_downcast, Downcast};
 pub use either::{Either, Left, Right};
 pub use enum_map::{Enum, EnumMap};
 pub use fehler::{throw, throws};
-pub use flexi_logger::{self, LogSpecification};
+pub use flexi_logger::LogSpecification;
 pub use fs2::FileExt;
 pub use if_chain::if_chain;
 pub use index_vec::{define_index_type, index_vec, IndexSlice, IndexVec};