[utils] Fix ignored custom filter in trim

ricab · ricab · commit 6baa7a4398fb · 2023-10-30T14:49:10.000+02:00
diff --git a/include/multipass/utils.h b/include/multipass/utils.h
@@ -280,7 +280,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
`@@ -280,7 +280,8 @@ Str&& multipass::utils::trim_end(Str&& s)`
`280`	`280`	`template <typename Str, typename Filter>`
`281`	`281`	`Str&& multipass::utils::trim(Str&& s, Filter&& filter)`
`282`	`282`	`{`
`283`		`- return trim_begin(trim_end(std::forward<Str>(s), std::forward<Filter>(filter)));`
	`283`	`+ auto&& ret = trim_end(std::forward<Str>(s), filter);`
	`284`	`+ return trim_begin(std::forward<decltype(ret)>(ret), std::forward<Filter>(filter));`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`template <typename Str>`