[utils] Fix ignored custom filter in trim

canonical · Oct 30, 2023 · 6baa7a4 · 6baa7a4
1 parent bc394d8
commit 6baa7a4
Showing 1 changed file with 2 additions and 1 deletion.
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>