[clangd] BindWithForward -> Bind. NFC

llvm-svn: 325868

4 files changed, 18 insertions, 23 deletions

diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp
index e9003d010da..305eddf7879 100644
--- a/clang-tools-extra/clangd/ClangdServer.cpp
+++ b/clang-tools-extra/clangd/ClangdServer.cpp
@@ -181,10 +181,9 @@ void ClangdServer::codeComplete(
     Callback(make_tagged(std::move(Result), std::move(TaggedFS.Tag)));
   };
 
-  WorkScheduler.runWithPreamble("CodeComplete", File,
-                                BindWithForward(Task, std::move(Contents),
-                                                File.str(),
-                                                std::move(Callback)));
+  WorkScheduler.runWithPreamble(
+      "CodeComplete", File,
+      Bind(Task, std::move(Contents), File.str(), std::move(Callback)));
 }
 
 void ClangdServer::signatureHelp(
@@ -224,9 +223,8 @@ void ClangdServer::signatureHelp(
         TaggedFS.Tag));
   };
 
-  WorkScheduler.runWithPreamble(
-      "SignatureHelp", File,
-      BindWithForward(Action, File.str(), std::move(Callback)));
+  WorkScheduler.runWithPreamble("SignatureHelp", File,
+                                Bind(Action, File.str(), std::move(Callback)));
 }
 
 llvm::Expected<tooling::Replacements>
@@ -312,7 +310,7 @@ void ClangdServer::rename(
 
   WorkScheduler.runWithAST(
       "Rename", File,
-      BindWithForward(Action, File.str(), NewName.str(), std::move(Callback)));
+      Bind(Action, File.str(), NewName.str(), std::move(Callback)));
 }
 
 Expected<tooling::Replacements>
@@ -378,8 +376,7 @@ void ClangdServer::dumpAST(PathRef File,
     Callback(Result);
   };
 
-  WorkScheduler.runWithAST("DumpAST", File,
-                           BindWithForward(Action, std::move(Callback)));
+  WorkScheduler.runWithAST("DumpAST", File, Bind(Action, std::move(Callback)));
 }
 
 void ClangdServer::findDefinitions(
@@ -396,7 +393,7 @@ void ClangdServer::findDefinitions(
   };
 
   WorkScheduler.runWithAST("Definitions", File,
-                           BindWithForward(Action, std::move(Callback)));
+                           Bind(Action, std::move(Callback)));
 }
 
 llvm::Optional<Path> ClangdServer::switchSourceHeader(PathRef Path) {
@@ -493,7 +490,7 @@ void ClangdServer::findDocumentHighlights(
   };
 
   WorkScheduler.runWithAST("Highlights", File,
-                           BindWithForward(Action, std::move(Callback)));
+                           Bind(Action, std::move(Callback)));
 }
 
 void ClangdServer::findHover(
@@ -516,8 +513,7 @@ void ClangdServer::findHover(
     Callback(make_tagged(std::move(Result), TaggedFS.Tag));
   };
 
-  WorkScheduler.runWithAST("Hover", File,
-                           BindWithForward(Action, std::move(Callback)));
+  WorkScheduler.runWithAST("Hover", File, Bind(Action, std::move(Callback)));
 }
 
 void ClangdServer::scheduleReparseAndDiags(
diff --git a/clang-tools-extra/clangd/Function.h b/clang-tools-extra/clangd/Function.h
index 7836cd222f9..de3ed5a114e 100644
--- a/clang-tools-extra/clangd/Function.h
+++ b/clang-tools-extra/clangd/Function.h
@@ -117,7 +117,7 @@ public:
                                  std::forward<RestArgs>(Rest)...)) {
 
 #ifndef NDEBUG
-    assert(!WasCalled && "Can only call result of BindWithForward once.");
+    assert(!WasCalled && "Can only call result of Bind once.");
     WasCalled = true;
 #endif
     return CallImpl(llvm::index_sequence_for<Args...>(),
@@ -132,7 +132,7 @@ public:
 /// The returned object must be called no more than once, as \p As are
 /// std::forwarded'ed (therefore can be moved) into \p F during the call.
 template <class Func, class... Args>
-ForwardBinder<Func, Args...> BindWithForward(Func F, Args &&... As) {
+ForwardBinder<Func, Args...> Bind(Func F, Args &&... As) {
   return ForwardBinder<Func, Args...>(
       std::make_tuple(std::forward<Func>(F), std::forward<Args>(As)...));
 }
diff --git a/clang-tools-extra/clangd/TUScheduler.cpp b/clang-tools-extra/clangd/TUScheduler.cpp
index 85cce00cfa5..5bc592f4787 100644
--- a/clang-tools-extra/clangd/TUScheduler.cpp
+++ b/clang-tools-extra/clangd/TUScheduler.cpp
@@ -218,7 +218,7 @@ void ASTWorker::update(
       OnUpdated(std::move(*Diags));
   };
 
-  startTask("Update", BindWithForward(Task, std::move(OnUpdated)), WantDiags);
+  startTask("Update", Bind(Task, std::move(OnUpdated)), WantDiags);
 }
 
 void ASTWorker::runWithAST(
@@ -239,7 +239,7 @@ void ASTWorker::runWithAST(
     LastASTSize = ActualAST->getUsedBytes();
   };
 
-  startTask(Name, BindWithForward(Task, std::move(Action)),
+  startTask(Name, Bind(Task, std::move(Action)),
             /*UpdateType=*/llvm::None);
 }
 
@@ -472,10 +472,9 @@ void TUScheduler::runWithPreamble(
     Action(InputsAndPreamble{InputsCopy, Preamble.get()});
   };
 
-  PreambleTasks->runAsync(
-      "task:" + llvm::sys::path::filename(File),
-      BindWithForward(Task, std::string(Name), std::string(File),
-                      Context::current().clone(), std::move(Action)));
+  PreambleTasks->runAsync("task:" + llvm::sys::path::filename(File),
+                          Bind(Task, std::string(Name), std::string(File),
+                               Context::current().clone(), std::move(Action)));
 }
 
 std::vector<std::pair<Path, std::size_t>>
diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.cpp b/clang-tools-extra/unittests/clangd/SyncAPI.cpp
index 9e6ab28c7a7..10f40533f03 100644
--- a/clang-tools-extra/unittests/clangd/SyncAPI.cpp
+++ b/clang-tools-extra/unittests/clangd/SyncAPI.cpp
@@ -32,7 +32,7 @@ template <typename T> struct CaptureProxy {
   operator UniqueFunction<void(T)>() && {
     assert(!Future.valid() && "conversion to callback called multiple times");
     Future = Promise.get_future();
-    return BindWithForward(
+    return Bind(
         [](std::promise<std::shared_ptr<T>> Promise, T Value) {
           Promise.set_value(std::make_shared<T>(std::move(Value)));
         },