clang-format

Author: jroelofs

llvm/tools/llvm-remarkutil/RemarkCounter.cpp

@@ -236,15 +236,18 @@ Error RemarkCounter::print(StringRef OutputFileName) {
 
 Expected<Filters> getRemarkFilter() {
   // Create Filter properties.
-  auto MaybeRemarkNameFilter = FilterMatcher::createExactOrRE(RemarkNameOpt, RemarkNameOptRE);
+  auto MaybeRemarkNameFilter =
+      FilterMatcher::createExactOrRE(RemarkNameOpt, RemarkNameOptRE);
   if (!MaybeRemarkNameFilter)
     return MaybeRemarkNameFilter.takeError();
 
-  auto MaybePassNameFilter = FilterMatcher::createExactOrRE(PassNameOpt, PassNameOptRE);
+  auto MaybePassNameFilter =
+      FilterMatcher::createExactOrRE(PassNameOpt, PassNameOptRE);
   if (!MaybePassNameFilter)
     return MaybePassNameFilter.takeError();
 
-  auto MaybeRemarkArgFilter = FilterMatcher::createExactOrRE(RemarkFilterArgByOpt, RemarkArgFilterOptRE);
+  auto MaybeRemarkArgFilter = FilterMatcher::createExactOrRE(
+      RemarkFilterArgByOpt, RemarkArgFilterOptRE);
   if (!MaybeRemarkArgFilter)
     return MaybeRemarkArgFilter.takeError();
 
@@ -253,7 +256,8 @@ Expected<Filters> getRemarkFilter() {
     RemarkType = RemarkTypeOpt;
 
   // Create RemarkFilter.
-  return Filters{std::move(*MaybeRemarkNameFilter), std::move(*MaybePassNameFilter),
+  return Filters{std::move(*MaybeRemarkNameFilter),
+                 std::move(*MaybePassNameFilter),
                  std::move(*MaybeRemarkArgFilter), RemarkType};
 }
 

llvm/tools/llvm-remarkutil/RemarkUtilHelpers.cpp

@@ -75,10 +75,13 @@ Expected<FilterMatcher> FilterMatcher::createRE(StringRef Arg,
   return std::move(FM);
 }
 
-Expected<std::optional<FilterMatcher>> FilterMatcher::createExactOrRE(const llvm::cl::opt<std::string> &ExactArg,
-  const llvm::cl::opt<std::string> &REArg) {
+Expected<std::optional<FilterMatcher>>
+FilterMatcher::createExactOrRE(const llvm::cl::opt<std::string> &ExactArg,
+                               const llvm::cl::opt<std::string> &REArg) {
   if (!ExactArg.empty() && !REArg.empty())
-    return createStringError(make_error_code(std::errc::invalid_argument), "conflicting arguments: --" + ExactArg.ArgStr + " and --" + REArg.ArgStr);
+    return createStringError(make_error_code(std::errc::invalid_argument),
+                             "conflicting arguments: --" + ExactArg.ArgStr +
+                                 " and --" + REArg.ArgStr);
 
   if (!ExactArg.empty())
     return createExact(ExactArg);

llvm/tools/llvm-remarkutil/RemarkUtilHelpers.h

@@ -79,8 +79,9 @@ class FilterMatcher {
   static Expected<FilterMatcher> createRE(StringRef Filter,
                                           const cl::list<std::string> &Arg);
 
-  static Expected<std::optional<FilterMatcher>> createExactOrRE(const llvm::cl::opt<std::string> &ExactArg,
-                                                 const llvm::cl::opt<std::string> &REArg);
+  static Expected<std::optional<FilterMatcher>>
+  createExactOrRE(const llvm::cl::opt<std::string> &ExactArg,
+                  const llvm::cl::opt<std::string> &REArg);
 
   static FilterMatcher createAny() { return {".*", true}; }