[clang-rename] apply stylistic fixes
llvm-svn: 275550
diff --git a/clang-tools-extra/clang-rename/USRFinder.cpp b/clang-tools-extra/clang-rename/USRFinder.cpp
index 01f7278..7e99e70 100644
--- a/clang-tools-extra/clang-rename/USRFinder.cpp
+++ b/clang-tools-extra/clang-rename/USRFinder.cpp
@@ -139,7 +139,7 @@
const SourceLocation Point; // The location to find the NamedDecl.
const std::string Name;
};
-}
+} // namespace
const NamedDecl *getNamedDeclAt(const ASTContext &Context,
const SourceLocation Point) {
@@ -191,5 +191,5 @@
return std::string(Buff.data(), Buff.size());
}
-} // namespace clang
} // namespace rename
+} // namespace clang
diff --git a/clang-tools-extra/clang-rename/USRFindingAction.h b/clang-tools-extra/clang-rename/USRFindingAction.h
index a38b37e..60a439e 100644
--- a/clang-tools-extra/clang-rename/USRFindingAction.h
+++ b/clang-tools-extra/clang-rename/USRFindingAction.h
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
///
/// \file
-/// \brief Provides an action to find all relevent USRs at a point.
+/// \brief Provides an action to find all relevant USRs at a point.
///
//===----------------------------------------------------------------------===//
@@ -25,18 +25,14 @@
namespace rename {
struct USRFindingAction {
- USRFindingAction(unsigned Offset, const std::string &Name) : SymbolOffset(Offset), OldName(Name) {
- }
+ USRFindingAction(unsigned Offset, const std::string &Name)
+ : SymbolOffset(Offset), OldName(Name) {}
std::unique_ptr<ASTConsumer> newASTConsumer();
// \brief get the spelling of the USR(s) as it would appear in source files.
- const std::string &getUSRSpelling() {
- return SpellingName;
- }
+ const std::string &getUSRSpelling() { return SpellingName; }
- const std::vector<std::string> &getUSRs() {
- return USRs;
- }
+ const std::vector<std::string> &getUSRs() { return USRs; }
private:
unsigned SymbolOffset;
@@ -45,7 +41,7 @@
std::vector<std::string> USRs;
};
-}
-}
+} // namespace rename
+} // namespace clang
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_RENAME_USR_FINDING_ACTION_H_
diff --git a/clang-tools-extra/clang-rename/USRLocFinder.cpp b/clang-tools-extra/clang-rename/USRLocFinder.cpp
index 02982b7..5979ecd 100644
--- a/clang-tools-extra/clang-rename/USRLocFinder.cpp
+++ b/clang-tools-extra/clang-rename/USRLocFinder.cpp
@@ -210,10 +210,10 @@
std::vector<SourceLocation> getLocationsOfUSR(StringRef USR, StringRef PrevName,
Decl *Decl) {
- USRLocFindingASTVisitor visitor(USR, PrevName);
+ USRLocFindingASTVisitor Visitor(USR, PrevName);
- visitor.TraverseDecl(Decl);
- return visitor.getLocationsFound();
+ Visitor.TraverseDecl(Decl);
+ return Visitor.getLocationsFound();
}
} // namespace rename
diff --git a/clang-tools-extra/clang-rename/tool/ClangRename.cpp b/clang-tools-extra/clang-rename/tool/ClangRename.cpp
index e3bdfcd..7475211 100644
--- a/clang-tools-extra/clang-rename/tool/ClangRename.cpp
+++ b/clang-tools-extra/clang-rename/tool/ClangRename.cpp
@@ -126,12 +126,12 @@
rename::RenamingAction RenameAction(NewName, PrevName, USRs,
Tool.getReplacements(), PrintLocations);
auto Factory = tooling::newFrontendActionFactory(&RenameAction);
- int res;
+ int ExitCode;
if (Inplace) {
- res = Tool.runAndSave(Factory.get());
+ ExitCode = Tool.runAndSave(Factory.get());
} else {
- res = Tool.run(Factory.get());
+ ExitCode = Tool.run(Factory.get());
if (!ExportFixes.empty()) {
std::error_code EC;
@@ -175,5 +175,5 @@
}
}
- exit(res);
+ exit(ExitCode);
}