alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

html-to-text: be explicit with array type

Browse Source 
clang in CI fails to deduce it, so let's help it a bit.
This commit is contained in:
Dirk-Jan C. Binnema
2023-07-26 23:24:29 +03:00
parent 275859a5b3
commit c06e765d13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils/mu-html-to-text.cc
View File

@ -334,7 +334,7 @@ comment(Context& ctx)
static bool // do we need a SPC separator for this tag? static bool // do we need a SPC separator for this tag?
needs_separator(std::string_view tagname) needs_separator(std::string_view tagname)
{ {
constexpr std::array nosep_tags = { constexpr std::array<const char*, 7> nosep_tags = {
"b", "em", "i", "s", "strike", "tt", "u" "b", "em", "i", "s", "strike", "tt", "u"
}; };
return !seq_some(nosep_tags, [&](auto&& t){return matches(tagname, t);}); return !seq_some(nosep_tags, [&](auto&& t){return matches(tagname, t);});
@ -343,7 +343,7 @@ needs_separator(std::string_view tagname)
static bool // do we need to skip the element completely? static bool // do we need to skip the element completely?
is_skip_element(std::string_view tagname) is_skip_element(std::string_view tagname)
{ {
constexpr std::array skip_tags = { constexpr std::array<const char*, 4> skip_tags = {
"script", "style", "head", "meta" "script", "style", "head", "meta"
}; };
return seq_some(skip_tags, [&](auto&& t){return matches(tagname, t);}); return seq_some(skip_tags, [&](auto&& t){return matches(tagname, t);});
@ -422,7 +422,7 @@ html_escape_char(Context& ctx)
{ {
// we only care about a few accented chars, and add them unaccented, lowercase, since that's // we only care about a few accented chars, and add them unaccented, lowercase, since that's
// we do for indexing anyway. // we do for indexing anyway.
constexpr std::array escs = { constexpr std::array<const char*, 11> escs = {
"breve", "breve",
"caron", "caron",
"circ", "circ",