Fix code to follow the "Don’t use else after a return" rule.

[sbenza]

Summary

Fix code to follow the "Don’t use else after a return" rule.
This is a followup from rL219792.

[• rafael]

LGTM with a nit.

lib/ASTMatchers/ASTMatchersInternal.cpp

252 ↗

(On Diff #15018)

You can drop the {} too now.

[alexfh]

LG

[sbenza]

Remove unnecessary {}

[sbenza]

Closed by commit rL219939 (authored by @sbenza).

cfe/trunk/lib/ASTMatchers/ASTMatchersInternal.cpp

HasNameMatcher::HasNameMatcher(StringRef NameRef)
   assert(!Name.empty());
 }
 
 bool HasNameMatcher::matchesNodeUnqualified(const NamedDecl &Node) const {
   assert(UseUnqualifiedMatch);
   if (Node.getIdentifier()) {
     // Simple name.
     return Name == Node.getName();
-  } else if (Node.getDeclName()) {
+  }
+  if (Node.getDeclName()) {
     // Name needs to be constructed.
     llvm::SmallString<128> NodeName;
     llvm::raw_svector_ostream OS(NodeName);
     Node.printName(OS);
     return Name == OS.str();
-  } else {
-    return false;
   }
+  return false;
 }
 
 bool HasNameMatcher::matchesNodeFull(const NamedDecl &Node) const {
   llvm::SmallString<128> NodeName = StringRef("::");
   llvm::raw_svector_ostream OS(NodeName);
   Node.printQualifiedName(OS);
   const StringRef FullName = OS.str();
   const StringRef Pattern = Name;
-  if (Pattern.startswith("::")) {
+
+  if (Pattern.startswith("::"))
     return FullName == Pattern;
-  } else {
-    return FullName.endswith(("::" + Pattern).str());
-  }
+
+  return FullName.endswith(Pattern) &&
+         FullName.drop_back(Pattern.size()).endswith("::");
 }
 
 bool HasNameMatcher::matchesNode(const NamedDecl &Node) const {
   // FIXME: There is still room for improvement, but it would require copying a
   // lot of the logic from NamedDecl::printQualifiedName(). The benchmarks do
   // not show like that extra complexity is needed right now.
   if (UseUnqualifiedMatch) {
     assert(matchesNodeUnqualified(Node) == matchesNodeFull(Node));
     return matchesNodeUnqualified(Node);
   }
   return matchesNodeFull(Node);
 }
 
 } // end namespace internal
 } // end namespace ast_matchers
 } // end namespace clang