[Clang-apply-replacements] Remove custom version printing; fix some Include What You Use warnings

[Eugene.Zelenko]

Summary

I checked this patch on my own build on RHEL 6. Regressions were OK.

[alexfh]

Full context diffs, please. See http://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-web-interface

[Eugene.Zelenko]

Full context diff.

[alexfh]

In many cases a transitively included header can be considered a part of a public interface of an already included header, e.g. it's reasonable to assume that DiagnosticIDs.h is a part of the public API exposed by Diagnostics.h. Thus, I consider IWYU fixes useless or even mildly harmful until (most of) LLVM/Clang headers are properly annotated with // IWYU pragma: export etc.

The other change seems fine, if you have properly verified the new behavior.

[Eugene.Zelenko]

Don't include DiagnosticIDs.h.

[alexfh]

In D22656#493036, @Eugene.Zelenko wrote:

Don't include DiagnosticIDs.h.

This header is just an example. I don't want anyone (including myself) manually figure out which of the headers inserted by IWYU actually need to be inserted. I'm also against adding #includes for every single transitively included header, since many of the headers can be considered "exported" by other headers. So, please, stop sending IWYU cleanups before reaching the general agreement and properly annotating LLVM and Clang headers.

[alexfh]

My last comment might come across as somewhat harsh. I didn't mean it to be harsh and just wanted to say that imo, llvm code is not ready to mechanically applying IWYU.

clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp

 /// \brief This file provides the main function for the
 /// clang-apply-replacements tool.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "clang-apply-replacements/Tooling/ApplyReplacements.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticOptions.h"
+#include "clang/Basic/FileManager.h"
+#include "clang/Basic/FileSystemOptions.h"
+#include "clang/Basic/LangOptions.h"
+#include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Basic/Version.h"
 #include "clang/Format/Format.h"
+#include "clang/Rewrite/Core/RewriteBuffer.h"
 #include "clang/Rewrite/Core/Rewriter.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringSet.h"
+#include "llvm/ADT/ArrayRef.h"                                   // for make...
+#include "llvm/ADT/IntrusiveRefCntPtr.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
+#include <algorithm>
+#include <cassert>
+#include <iterator>
+#include <memory>
+#include <string>
+#include <system_error>
+#include <vector>
 
 using namespace llvm;
 using namespace clang;
 using namespace clang::replace;
 
 static cl::opt<std::string> Directory(cl::Positional, cl::Required,
                                       cl::desc("<Search Root Directory>"));
 
 static cl::OptionCategory ReplacementCategory("Replacement Options");
 static cl::OptionCategory FormattingCategory("Formatting Options");
 
 const cl::OptionCategory *VisibleCategories[] = {&ReplacementCategory,
                                                  &FormattingCategory};
 
 static cl::opt<bool> RemoveTUReplacementFiles(
     "remove-change-desc-files",
     cl::desc("Remove the change description files regardless of successful\n"
              "merging/replacing."),
     cl::init(false), cl::cat(ReplacementCategory));
 
-
 static cl::opt<bool> DoFormat(
     "format",
     cl::desc("Enable formatting of code changed by applying replacements.\n"
              "Use -style to choose formatting style.\n"),
     cl::cat(FormattingCategory));
 
 // FIXME: Consider making the default behaviour for finding a style
 // configuration file to start the search anew for every file being changed to
public:
   }
 
 private:
   const TUReplacementFiles &TURFiles;
   clang::DiagnosticsEngine &Diag;
 };
 } // namespace
 
-static void printVersion() {
-  outs() << "clang-apply-replacements version " CLANG_VERSION_STRING << "\n";
-}
-
 /// \brief Convenience function to get rewritten content for \c Filename from
 /// \c Rewrites.
 ///
 /// \pre Replacements[i].getFilePath() == Replacements[i+1].getFilePath().
 /// \post Replacements.empty() -> Result.empty()
 ///
 /// \param[in] Replacements Replacements to apply
 /// \param[in] Rewrites Rewriter to use to apply replacements.
SM.overrideFileContents(Files.getFile(FileName),
                           llvm::MemoryBuffer::getMemBufferCopy(FileData));
   Rewriter Rewrites(SM, LangOptions());
 
   return getRewrittenData(FormattingReplacements, Rewrites, FormattedFileData);
 }
 
 int main(int argc, char **argv) {
   cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories));
-
-  cl::SetVersionPrinter(&printVersion);
   cl::ParseCommandLineOptions(argc, argv);
 
   IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
   DiagnosticsEngine Diagnostics(
       IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()),
       DiagOpts.get());
 
   // Determine a formatting style from options.