h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-19 21:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Use move semantics in trim and history_item_t

Browse Source
This commit is contained in:
ridiculousfish
2019-08-25 13:37:06 -07:00
parent dd34bf0ba6
commit 99c498d3d7
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wcstringutil.cpp
View File

@@ -49,16 +49,19 @@ wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
return output;
}
wcstring trim(const wcstring &input) { return trim(input, L"\t\v \r\n"); }
wcstring trim(wcstring input) { return trim(std::move(input), L"\t\v \r\n"); }
wcstring trim(const wcstring &input, const wchar_t *any_of) {
auto begin_offset = input.find_first_not_of(any_of);
if (begin_offset == wcstring::npos) {
wcstring trim(wcstring input, const wchar_t *any_of) {
wcstring result = std::move(input);
size_t suffix = result.find_last_not_of(any_of);
if (suffix == wcstring::npos) {
return wcstring{};
}
auto end = input.cbegin() + input.find_last_not_of(any_of);
result.erase(suffix + 1);
wcstring result(input.begin() + begin_offset, end + 1);
auto prefix = result.find_first_not_of(any_of);
assert(prefix != wcstring::npos && "Should have one non-trimmed character");
result.erase(0, prefix);
return result;
}