[utils] Fix ignored custom filter in trim

ricab · ricab · commit d7703bf289d0 · 2023-10-30T14:15:37.000+02:00
diff --git a/include/multipass/utils.h b/include/multipass/utils.h
@@ -277,7 +277,8 @@ Str&& multipass::utils::trim_end(Str&& s)
 template <typename Str, typename Filter>
 Str&& multipass::utils::trim(Str&& s, Filter&& filter)
 {
-    return trim_begin(trim_end(std::forward<Str>(s), std::forward<Filter>(filter)));
+    auto&& ret = trim_end(std::forward<Str>(s), filter);
+    return trim_begin(std::forward<decltype(ret)>(ret), std::forward<Filter>(filter));
 }
 
 template <typename Str>

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,8 @@ Str&& multipass::utils::trim_end(Str&& s)`
`277`	`277`	`template <typename Str, typename Filter>`
`278`	`278`	`Str&& multipass::utils::trim(Str&& s, Filter&& filter)`
`279`	`279`	`{`
`280`		`- return trim_begin(trim_end(std::forward<Str>(s), std::forward<Filter>(filter)));`
	`280`	`+ auto&& ret = trim_end(std::forward<Str>(s), filter);`
	`281`	`+ return trim_begin(std::forward<decltype(ret)>(ret), std::forward<Filter>(filter));`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`template <typename Str>`