dlang safe default imminent, look ahead

- @safe @trusted & @system, reconsider @trusted

1 files changed, 9 insertions, 9 deletions

diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d
index 4de98a1..f8f5ba4 100644
--- a/src/doc_reform/io_out/epub3.d
+++ b/src/doc_reform/io_out/epub3.d
@@ -14,12 +14,12 @@ template outputEPub3() {
     doc_reform.io_out.xmls_css;
   mixin InternalMarkup;
   mixin outputXHTMLs;
-  string epub3_mimetypes() @safe {
+  @safe string epub3_mimetypes() {
     string o;
     o = format(q"┃application/epub+zip┃") ~ "\n";
     return o;
   }
-  string epub3_container_xml() @safe {
+  @safe string epub3_container_xml() {
     string o;
     o = format(q"┃<?xml version='1.0' encoding='utf-8'?>┃") ~ "\n";
     o ~= format(q"┃<container version="1.0"
@@ -30,7 +30,7 @@ template outputEPub3() {
   </rootfiles>┃") ~ "\n</container>\n";
     return o;
   }
-  string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) @safe {
+  @safe string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
     auto xhtml_format = outputXHTMLs();
     auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
     string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
@@ -128,7 +128,7 @@ template outputEPub3() {
     }
     return content;
   }
-  string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) @safe {
+  @safe string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
     enum DomTags { none, open, close, close_and_open, open_still, }
     auto markup = InlineMarkup();
     static auto rgx = Rgx();
@@ -207,7 +207,7 @@ template outputEPub3() {
   </html>\n";
     return toc;
   }
-  string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) @safe {
+  @safe string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
     int counter = 0;
     string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO shared elsewhere
     auto markup = InlineMarkup();
@@ -297,10 +297,10 @@ template outputEPub3() {
     return toc;
   }
   
-  void outputEPub3(D,I)(
+  @system void outputEPub3(D,I)(
     const D    doc_abstraction,
           I    doc_matters,
-  ) { // @trusted
+  ) {
     mixin spineOutputRgxInit;
     auto xhtml_format = outputXHTMLs();
     static auto rgx = Rgx();
@@ -606,10 +606,10 @@ template outputEPub3() {
     epubWrite.oebps_content_opf =      doc_abstraction.epub3_oebps_content(doc_matters, oepbs_content_parts);
     epubWrite.epub3_write_output_files(doc_matters);
   }
-  void epub3_write_output_files(W,M)(
+  @system void epub3_write_output_files(W,M)(
     W epub_write,
     M doc_matters,
-  ) { // @trusted
+  ) {
     debug(asserts) {
       static assert(is(typeof(epub_write.doc_epub3)              == string[][string]));
       static assert(is(typeof(epub_write.mimetypes)              == string));