From 0ce4e986fcd5af430d9f7bfdd625da7a58a1527e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 4 Feb 2020 17:10:57 -0500
Subject: imports related, mostly cosmetic

---
 src/doc_reform/io_out/create_zip_file.d | 9 +++++----
 src/doc_reform/io_out/epub3.d           | 3 +--
 src/doc_reform/io_out/html.d            | 4 +---
 src/doc_reform/io_out/hub.d             | 2 +-
 src/doc_reform/io_out/latex.d           | 2 +-
 src/doc_reform/io_out/metadata.d        | 5 +++--
 src/doc_reform/io_out/paths_output.d    | 3 ++-
 src/doc_reform/io_out/sqlite.d          | 6 +++---
 src/doc_reform/io_out/xmls.d            | 4 +---
 9 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'src/doc_reform/io_out')

diff --git a/src/doc_reform/io_out/create_zip_file.d b/src/doc_reform/io_out/create_zip_file.d
index 0ad8ada..ea7e5f6 100644
--- a/src/doc_reform/io_out/create_zip_file.d
+++ b/src/doc_reform/io_out/create_zip_file.d
@@ -1,9 +1,10 @@
 module doc_reform.io_out.create_zip_file;
 template createZipFile() {
-  import std.file;
-  import std.outbuffer;
-  import std.string;
-  import std.zip;
+  import
+    std.file,
+    std.outbuffer,
+    std.string,
+    std.zip;
   @safe void createZipFile(
     string zip_file_name,
     void[] compressed_zip_data,
diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d
index 9d29968..14c328b 100644
--- a/src/doc_reform/io_out/epub3.d
+++ b/src/doc_reform/io_out/epub3.d
@@ -1,14 +1,13 @@
 module doc_reform.io_out.epub3;
 template outputEPub3() {
-  import doc_reform.io_out;
   import
-    std.digest.sha,
     std.file,
     std.outbuffer,
     std.uri,
     std.zip,
     std.conv : to;
   import
+    doc_reform.io_out,
     doc_reform.io_out.create_zip_file,
     doc_reform.io_out.xmls,
     doc_reform.io_out.xmls_css;
diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d
index ee530ca..6a15614 100644
--- a/src/doc_reform/io_out/html.d
+++ b/src/doc_reform/io_out/html.d
@@ -1,14 +1,12 @@
 module doc_reform.io_out.html;
 template outputHTML() {
-  import doc_reform.io_out;
   import
-    std.digest.sha,
     std.file,
     std.outbuffer,
     std.uri,
-    std.zip,
     std.conv : to;
   import
+    doc_reform.io_out,
     doc_reform.io_out.create_zip_file,
     doc_reform.io_out.xmls,
     doc_reform.io_out.xmls_css;
diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d
index e275348..548cceb 100644
--- a/src/doc_reform/io_out/hub.d
+++ b/src/doc_reform/io_out/hub.d
@@ -10,7 +10,6 @@ template outputHub() {
     doc_reform.io_out.odt,
     doc_reform.io_out.create_zip_file,
     doc_reform.io_out.paths_output;
-  import std.parallelism;
   @system void outputHub(D,I)(
     const D doc_abstraction,
     I doc_matters
@@ -93,6 +92,7 @@ template outputHub() {
         Scheduled!()(schedule, doc_abstraction, doc_matters);
       }
     } else {
+      import std.parallelism;
       foreach(schedule; parallel(doc_matters.opt.action.output_task_scheduler)) {
         Scheduled!()(schedule, doc_abstraction, doc_matters);
       }
diff --git a/src/doc_reform/io_out/latex.d b/src/doc_reform/io_out/latex.d
index ff5b0df..8ec144b 100644
--- a/src/doc_reform/io_out/latex.d
+++ b/src/doc_reform/io_out/latex.d
@@ -1,12 +1,12 @@
 module doc_reform.io_out.latex;
 template outputLaTeX() {
-  import doc_reform.io_out;
   import
     std.digest.sha,
     std.file,
     std.outbuffer,
     std.uri,
     std.conv : to;
+  import doc_reform.io_out;
   mixin InternalMarkup; // watch
   mixin spineRgxOut;
   static auto rgx = RgxO();
diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d
index 5dfdfe2..65f40b2 100644
--- a/src/doc_reform/io_out/metadata.d
+++ b/src/doc_reform/io_out/metadata.d
@@ -1,8 +1,9 @@
 module doc_reform.io_out.metadata;
 template outputMetadata() {
   @safe void outputMetadata(T)( T  doc_matters) {
-    import std.file;
-    import std.format;
+    import
+      std.file,
+      std.format;
     import doc_reform.io_out;
     mixin InternalMarkup;
     string[] metadata_;
diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d
index f01f88b..83c9728 100644
--- a/src/doc_reform/io_out/paths_output.d
+++ b/src/doc_reform/io_out/paths_output.d
@@ -2,7 +2,8 @@
   default settings
 +/
 module doc_reform.io_out.paths_output;
-import std.array,
+import
+  std.array,
   std.path,
   std.regex,
   std.stdio;
diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d
index d24fc00..1a30204 100644
--- a/src/doc_reform/io_out/sqlite.d
+++ b/src/doc_reform/io_out/sqlite.d
@@ -2,10 +2,10 @@ module doc_reform.io_out.sqlite;
 import doc_reform.io_out;
 import
   std.file,
-  std.uri,
-  std.conv : to;
-import d2sqlite3;
+  std.uri;
+import std.conv : to;
 import std.typecons : Nullable;
+import d2sqlite3;
 mixin spineRgxOut;
 mixin InternalMarkup;
 static auto rgx = RgxO();
diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d
index b640d81..89180eb 100644
--- a/src/doc_reform/io_out/xmls.d
+++ b/src/doc_reform/io_out/xmls.d
@@ -1,14 +1,12 @@
 module doc_reform.io_out.xmls;
 template outputXHTMLs() {
-  import doc_reform.io_out;
   import
-    std.digest.sha,
     std.file,
     std.outbuffer,
     std.uri,
-    std.zip,
     std.conv : to;
   import
+    doc_reform.io_out,
     doc_reform.io_out.create_zip_file,
     doc_reform.io_out.xmls,
     doc_reform.io_out.xmls_css;
-- 
cgit v1.2.3