More transform(...) filter cleanup using mem_fn when possible

3 files changed, 3 insertions, 7 deletions

diff --git a/src/main.cc b/src/main.cc
index d6fdb4e8..241e4336 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -67,8 +67,7 @@ void register_env_vars()
             "buflist", false,
             [](StringView name, const Context& context)
             { return join(BufferManager::instance() |
-                          transform([](const std::unique_ptr<Buffer>& b)
-                                    { return b->display_name(); }), ':'); }
+                          transform(std::mem_fn(&Buffer::display_name)), ':'); }
         }, {
             "timestamp", false,
             [](StringView name, const Context& context) -> String
diff --git a/src/option_manager.cc b/src/option_manager.cc
index 8d896514..c8722c15 100644
--- a/src/option_manager.cc
+++ b/src/option_manager.cc
@@ -119,8 +119,7 @@ CandidateList OptionsRegistry::complete_option_name(StringView prefix,
     return complete(prefix, cursor_pos, m_descs |
                     filter([](const OptionPtr& desc)
                            { return not (desc->flags() & OptionFlags::Hidden); }) |
-                    transform([](const OptionPtr& desc) -> const String&
-                              { return desc->name(); }));
+                    transform(std::mem_fn(&OptionDesc::name)));
 }
 
 }
diff --git a/src/selection.cc b/src/selection.cc
index 7d725c6f..6b74a6ab 100644
--- a/src/selection.cc
+++ b/src/selection.cc
@@ -610,9 +610,7 @@ String selection_to_string(const Selection& selection)
 
 String selection_list_to_string(const SelectionList& selections)
 {
-    return join(selections | transform([](const Selection& s)
-                                       { return selection_to_string(s); }),
-                ':', false);
+    return join(selections | transform(selection_to_string), ':', false);
 }
 
 Selection selection_from_string(StringView desc)