address compilation issues with dmd (v2.090.0)

2 files changed, 22 insertions, 25 deletions

diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d
index ce16f24..4889e4f 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -4,17 +4,16 @@
   meta_config_files.d
 +/
 module doc_reform.io_in.read_config_files;
+import
+  std.file,
+  std.path,
+  doc_reform.meta,
+  doc_reform.io_in.paths_source,
+  doc_reform.meta.rgx;
 
-static template readConfigSite() {
-  import
-    doc_reform.meta.rgx;
-  import
-    doc_reform.meta,
-    doc_reform.io_in.paths_source,
-    std.file,
-    std.path;
-  mixin spineRgxInit;
+template readConfigSite() {
   @system final auto readConfigSite(C)(C _conf_file_details) {
+    mixin spineRgxInit;
     static auto rgx = Rgx();
     string conf_filename = "NONE";
     string config_file_str;
@@ -112,14 +111,13 @@ webserv:
 }
 static template readConfigDoc() {
   import
-    doc_reform.meta.rgx;
-  import
+    std.file,
+    std.path,
     doc_reform.meta,
     doc_reform.io_in.paths_source,
-    std.file,
-    std.path;
-  mixin spineRgxInit;
+    doc_reform.meta.rgx;
   @system final auto readConfigDoc(M,E)(M _manifested, E _env) {
+    mixin spineRgxInit;
     static auto rgx = Rgx();
     string config_file_str;
     string conf_filename = "NONE";
@@ -165,10 +163,10 @@ static template readConfigDoc() {
 }
 static template configReadSiteYAML() {
   import
-    doc_reform.meta,
-    doc_reform.io_in.paths_source,
     std.file,
-    std.path;
+    std.path,
+    doc_reform.meta,
+    doc_reform.io_in.paths_source;
   @safe final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInSiteYAML!()(_manifested, _env);
     auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
@@ -179,10 +177,10 @@ static template configReadSiteYAML() {
 }
 static template configReadDocYAML() {
   import
-    doc_reform.meta,
-    doc_reform.io_in.paths_source,
     std.file,
-    std.path;
+    std.path,
+    doc_reform.meta,
+    doc_reform.io_in.paths_source;
   @safe final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInDocYAML!()(_manifested, _env);
     auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d
index fcbd075..041ec91 100644
--- a/src/doc_reform/io_in/read_source_files.d
+++ b/src/doc_reform/io_in/read_source_files.d
@@ -4,14 +4,13 @@
   - if master file scan for addional files to import/insert
 +/
 module doc_reform.io_in.read_source_files;
-static template spineRawMarkupContent() {
-  import
-    doc_reform.meta.rgx;
+template spineRawMarkupContent() {
   import
+    std.file,
+    std.path,
     doc_reform.meta,
     doc_reform.io_in.paths_source,
-    std.file,
-    std.path;
+    doc_reform.meta.rgx;
   mixin spineRgxInit;
   static auto rgx = Rgx();
   string[] _images=[];