puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove trailing whitespace

Browse source
This commit is contained in:
Eelco Dolstra 2021-01-21 00:49:29 +01:00
parent 8d4268d190
commit 40608342cb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/error.cc
View file

@ -212,8 +212,7 @@ static std::string indent(std::string_view indentFirst, std::string_view indentR
while (!s.empty()) { while (!s.empty()) {
auto end = s.find('\n'); auto end = s.find('\n');
if (!first) res += "\n"; if (!first) res += "\n";
res += first ? indentFirst : indentRest; res += chomp(std::string(first ? indentFirst : indentRest) + std::string(s.substr(0, end)));
res += s.substr(0, end);
first = false; first = false;
if (end == s.npos) break; if (end == s.npos) break;
s = s.substr(end + 1); s = s.substr(end + 1);

2
src/libutil/util.cc
View file

@ -1249,7 +1249,7 @@ template StringSet tokenizeString(std::string_view s, const string & separators)
template vector<string> tokenizeString(std::string_view s, const string & separators); template vector<string> tokenizeString(std::string_view s, const string & separators);
string chomp(const string & s) string chomp(std::string_view s)
{ {
size_t i = s.find_last_not_of(" \n\r\t"); size_t i = s.find_last_not_of(" \n\r\t");
return i == string::npos ? "" : string(s, 0, i + 1); return i == string::npos ? "" : string(s, 0, i + 1);

5
src/libutil/util.hh
View file

@ -373,8 +373,9 @@ template<class C> Strings quoteStrings(const C & c)
} }
/* Remove trailing whitespace from a string. */ /* Remove trailing whitespace from a string. FIXME: return
string chomp(const string & s); std::string_view. */
string chomp(std::string_view s);
/* Remove whitespace from the start and end of a string. */ /* Remove whitespace from the start and end of a string. */