From de02319cfa7b4bbff8c111bda02be1a7c6591555 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sun, 5 Jan 2020 20:17:17 -0500
Subject: dlang safe default imminent, look ahead

- @safe @trusted & @system, reconsider @trusted
---
 src/doc_reform/io_out/html.d | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/doc_reform/io_out/html.d')

diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d
index 8598ca5..637b007 100644
--- a/src/doc_reform/io_out/html.d
+++ b/src/doc_reform/io_out/html.d
@@ -13,10 +13,10 @@ template outputHTML() {
     doc_reform.io_out.xmls,
     doc_reform.io_out.xmls_css;
   mixin outputXHTMLs;
-  void scroll(D,M)(
+  @safe void scroll(D,M)(
     const        D    doc_abstraction,
                  M    doc_matters,
-  ) @safe {
+  ) {
     mixin spineOutputRgxInit;
     auto xhtml_format = outputXHTMLs();
     static auto rgx = Rgx();
@@ -183,10 +183,10 @@ template outputHTML() {
     doc = xhtml_format.html_head(doc_matters, "scroll") ~ doc_html ~ xhtml_format.tail;
     scroll_write_output(doc, doc_matters);
   }
-  void scroll_write_output(D,M)(
+  @trusted void scroll_write_output(D,M)(
     D doc,
     M doc_matters,
-  ) @trusted {
+  ) {
     debug(asserts) {
       static assert(is(typeof(doc)    == string[]));
     }
@@ -206,10 +206,10 @@ template outputHTML() {
       writeln(" ", pth_html.fn_scroll(doc_matters.src.filename));
     }
   }
-  void seg(D,M)(
+  @safe void seg(D,M)(
     const D    doc_abstraction,
           M    doc_matters,
-  ) @safe {
+  ) {
     mixin spineOutputRgxInit;
     static auto rgx = Rgx();
     auto xhtml_format = outputXHTMLs();
@@ -459,11 +459,11 @@ template outputHTML() {
     }
     seg_write_output(doc_html, doc_html_endnotes, doc_matters);
   }
-  void seg_write_output(D,E,M)(
+  @trusted void seg_write_output(D,E,M)( // @system?
     D doc_html,
     E doc_html_endnotes,
     M doc_matters,
-  ) @trusted { // @system?
+  ) {
     debug(asserts) {
       static assert(is(typeof(doc_html)      == string[][string]));
     }
@@ -493,7 +493,7 @@ template outputHTML() {
       writeln(" ", pth_html.fn_seg(doc_matters.src.filename, "toc"));
     }
   }
-  void css(M)(M doc_matters) @safe {
+  @safe void css(M)(M doc_matters) {
     auto css = spineCss(doc_matters);
     auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
     try {
@@ -508,9 +508,9 @@ template outputHTML() {
       // Handle error
     }
   }
-  void images_cp(M)(
+  @trusted void images_cp(M)( // @system
     M    doc_matters,
-  ) @trusted { // @system
+  ) {
     { /+ (copy html images) +/
   
       auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
-- 
cgit v1.2.3