From 629af1457bf724ba9f0213a9b0e2ca1757f92705 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 11 Apr 2018 21:12:24 -0400 Subject: various minor --- src/sdp/meta/read_config_files.d | 8 ++++---- src/sdp/meta/read_source_files.d | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sdp/meta') diff --git a/src/sdp/meta/read_config_files.d b/src/sdp/meta/read_config_files.d index 74c5a12..56a2bf8 100644 --- a/src/sdp/meta/read_config_files.d +++ b/src/sdp/meta/read_config_files.d @@ -20,7 +20,7 @@ static template configReadInSiteTOML() { writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations); } foreach(pth; possible_config_path_locations) { - auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_toml)).array; + auto conf_file = asNormalizedPath(chainPath(pth.to!string, conf_toml)).array; if (config_file_str.length > 0) { break; } @@ -57,7 +57,7 @@ static template configReadInDocTOML() { writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations); } foreach(pth; possible_config_path_locations) { - auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_toml)).array; + auto conf_file = asNormalizedPath(chainPath(pth.to!string, conf_toml)).array; if (config_file_str.length > 0) { break; } @@ -110,7 +110,7 @@ static template readConfigSite() { auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.config_local_site; foreach(conf_fn; [_conf_file_details.config_filename_site_toml]) { foreach(pth; possible_config_path_locations) { - auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array; + auto conf_file = asNormalizedPath(chainPath(pth.to!string, conf_fn)).array; conf_filename = conf_fn; if (config_file_str.length > 0) { // conf_filename = conf_fn; @@ -160,7 +160,7 @@ static template readConfigDoc() { auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.sisu_document_make; foreach(conf_fn; [_conf_file_details.config_filename_document_toml]) { foreach(pth; possible_config_path_locations) { - auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array; + auto conf_file = asNormalizedPath(chainPath(pth.to!string, conf_fn)).array; conf_filename = conf_fn; if (config_file_str.length > 0) { // conf_filename = conf_fn; diff --git a/src/sdp/meta/read_source_files.d b/src/sdp/meta/read_source_files.d index 5c7d83b..135d8e8 100644 --- a/src/sdp/meta/read_source_files.d +++ b/src/sdp/meta/read_source_files.d @@ -289,7 +289,7 @@ static template SiSUrawMarkupContent() { auto insert_sub_pth = m.captures[1]; auto fn_src_insert = chainPath(markup_src_file_path, insert_sub_pth ~ insert_fn).array; - insert_file_list ~= to!string(fn_src_insert); + insert_file_list ~= fn_src_insert.to!string; auto raw = MarkupRawUnit(); /+ TODO +/ auto markup_sourcefile_insert_content @@ -306,7 +306,7 @@ static template SiSUrawMarkupContent() { auto contents_insert_tu = ins.scan_subdoc_source( _opt_action, markup_sourcefile_insert_content, - to!string(fn_src_insert) + fn_src_insert.to!string ); contents ~= contents_insert_tu[0]; // images to extract for image list? if (_opt_action.source || _opt_action.sisupod) { -- cgit v1.2.3