[Clang-rename] Remove custom version, fix extra space in error message

[Eugene.Zelenko]

Summary

I also fixed some Include What You Use Warnings.

[omtcyfz]

clang-rename/tool/ClangRename.cpp

19 ↗

(On Diff #64977)

Do we use anything from DiagnosticIDs.h here?

[Eugene.Zelenko]

It's used for DiagnosticIDs.. However, in D22656 Alexander told that DiagnosticIDs.h should be treated as part of Diagnostic.h.

[omtcyfz]

Just remove it then?

[Eugene.Zelenko]

Don't include DiagnosticIDs.h

[omtcyfz]

lgtm

clang-tools-extra/trunk/clang-rename/tool/ClangRename.cpp

 /// \file
 /// \brief This file implements a clang-rename tool that automatically finds and
 /// renames symbols in C++ code.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "../USRFindingAction.h"
 #include "../RenamingAction.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
+#include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/FileManager.h"
+#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/LangOptions.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Frontend/CommandLineSourceLoc.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
+#include "clang/Basic/SourceManager.h"
+#include "clang/Basic/TokenKinds.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/ParseAST.h"
-#include "clang/Parse/Parser.h"
 #include "clang/Rewrite/Core/Rewriter.h"
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/ReplacementsYaml.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/Support/Host.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/YAMLTraits.h"
+#include <cstdlib>
 #include <string>
+#include <system_error>
 
 using namespace llvm;
 
 cl::OptionCategory ClangRenameCategory("Clang-rename options");
 
 static cl::opt<std::string>
 NewName(
     "new-name",
PrintLocations(
     cl::cat(ClangRenameCategory));
 static cl::opt<std::string>
 ExportFixes(
     "export-fixes",
     cl::desc("YAML file to store suggested fixes in."),
     cl::value_desc("filename"),
     cl::cat(ClangRenameCategory));
 
-#define CLANG_RENAME_VERSION "0.0.1"
-
-static void PrintVersion() {
-  outs() << "clang-rename version " << CLANG_RENAME_VERSION << '\n';
-}
-
 using namespace clang;
 
 const char RenameUsage[] = "A tool to rename symbols in C/C++ code.\n\
 clang-rename renames every occurrence of a symbol found at <offset> in\n\
 <source0>. If -i is specified, the edited files are overwritten to disk.\n\
 Otherwise, the results are written to stdout.\n";
 
 int main(int argc, const char **argv) {
-  cl::SetVersionPrinter(PrintVersion);
   tooling::CommonOptionsParser OP(argc, argv, ClangRenameCategory, RenameUsage);
 
   // Check the arguments for correctness.
 
   if (NewName.empty()) {
     errs() << "ERROR: no new name provided.\n\n";
     exit(1);
   }
 
   // Check if NewName is a valid identifier in C++17.
   LangOptions Options;
   Options.CPlusPlus = true;
   Options.CPlusPlus1z = true;
   IdentifierTable Table(Options);
   auto NewNameTokKind = Table.get(NewName).getTokenID();
   if (!tok::isAnyIdentifier(NewNameTokKind)) {
-    errs() << "ERROR: new name is not a valid identifier in  C++17.\n\n";
+    errs() << "ERROR: new name is not a valid identifier in C++17.\n\n";
     exit(1);
   }
 
   // Get the USRs.
   auto Files = OP.getSourcePathList();
   tooling::RefactoringTool Tool(OP.getCompilations(), Files);
   rename::USRFindingAction USRAction(SymbolOffset, OldName);
 

clang-tools-extra/trunk/test/clang-rename/InvalidNewName.cpp

 // RUN: not clang-rename -new-name=class -offset=133 %s 2>&1 | FileCheck %s
-// CHECK: ERROR: new name is not a valid identifier in  C++17.
+// CHECK: ERROR: new name is not a valid identifier in C++17.