https://github.com/kazutakahirata created
https://github.com/llvm/llvm-project/pull/142296
These are identified by misc-include-cleaner. I've filtered out those
that break builds. Also, I'm staying away from llvm-config.h,
config.h, and Compiler.h, which likely cause platform- or
compiler-specific build failures.
>From 42c3d15fd9cf28a50bf083dc02c83a826a7502d4 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <k...@google.com>
Date: Sat, 31 May 2025 15:06:16 -0700
Subject: [PATCH] [Format] Remove unused includes (NFC)
These are identified by misc-include-cleaner. I've filtered out those
that break builds. Also, I'm staying away from llvm-config.h,
config.h, and Compiler.h, which likely cause platform- or
compiler-specific build failures.
---
clang/lib/Format/DefinitionBlockSeparator.cpp | 1 -
clang/lib/Format/FormatToken.cpp | 1 -
clang/lib/Format/MacroExpander.cpp | 3 ---
clang/lib/Format/ObjCPropertyAttributeOrderFixer.cpp | 2 --
clang/lib/Format/QualifierAlignmentFixer.cpp | 3 ---
clang/lib/Format/SortJavaScriptImports.cpp | 2 --
clang/lib/Format/TokenAnalyzer.cpp | 3 ---
clang/lib/Format/TokenAnnotator.cpp | 1 -
clang/lib/Format/UnwrappedLineParser.cpp | 2 --
9 files changed, 18 deletions(-)
diff --git a/clang/lib/Format/DefinitionBlockSeparator.cpp
b/clang/lib/Format/DefinitionBlockSeparator.cpp
index ded51bc6c013c..3f4ce5fa3a428 100644
--- a/clang/lib/Format/DefinitionBlockSeparator.cpp
+++ b/clang/lib/Format/DefinitionBlockSeparator.cpp
@@ -14,7 +14,6 @@
//===----------------------------------------------------------------------===//
#include "DefinitionBlockSeparator.h"
-#include "llvm/Support/Debug.h"
#define DEBUG_TYPE "definition-block-separator"
namespace clang {
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp
index e0867f6dcce06..0d8ae1c4a77eb 100644
--- a/clang/lib/Format/FormatToken.cpp
+++ b/clang/lib/Format/FormatToken.cpp
@@ -15,7 +15,6 @@
#include "FormatToken.h"
#include "ContinuationIndenter.h"
#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Debug.h"
#include <climits>
namespace clang {
diff --git a/clang/lib/Format/MacroExpander.cpp
b/clang/lib/Format/MacroExpander.cpp
index ba2992889e674..37c25e6941ef2 100644
--- a/clang/lib/Format/MacroExpander.cpp
+++ b/clang/lib/Format/MacroExpander.cpp
@@ -20,10 +20,7 @@
#include "clang/Basic/TokenKinds.h"
#include "clang/Format/Format.h"
#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
#include "clang/Lex/Lexer.h"
-#include "clang/Lex/ModuleLoader.h"
-#include "clang/Lex/Preprocessor.h"
#include "clang/Lex/PreprocessorOptions.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/lib/Format/ObjCPropertyAttributeOrderFixer.cpp
b/clang/lib/Format/ObjCPropertyAttributeOrderFixer.cpp
index 3ebac99b17fb3..37a1807197341 100644
--- a/clang/lib/Format/ObjCPropertyAttributeOrderFixer.cpp
+++ b/clang/lib/Format/ObjCPropertyAttributeOrderFixer.cpp
@@ -15,8 +15,6 @@
#include "ObjCPropertyAttributeOrderFixer.h"
-#include <algorithm>
-
namespace clang {
namespace format {
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp
b/clang/lib/Format/QualifierAlignmentFixer.cpp
index 23e8b44eee15c..8e55d339b2388 100644
--- a/clang/lib/Format/QualifierAlignmentFixer.cpp
+++ b/clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -17,9 +17,6 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/Regex.h"
-#include <algorithm>
-#include <optional>
-
#define DEBUG_TYPE "format-qualifier-alignment-fixer"
namespace clang {
diff --git a/clang/lib/Format/SortJavaScriptImports.cpp
b/clang/lib/Format/SortJavaScriptImports.cpp
index f55993fb4c11c..ace3dffebec40 100644
--- a/clang/lib/Format/SortJavaScriptImports.cpp
+++ b/clang/lib/Format/SortJavaScriptImports.cpp
@@ -15,7 +15,6 @@
#include "TokenAnalyzer.h"
#include "TokenAnnotator.h"
#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/SourceManager.h"
@@ -24,7 +23,6 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Debug.h"
-#include <algorithm>
#include <string>
#define DEBUG_TYPE "format-formatter"
diff --git a/clang/lib/Format/TokenAnalyzer.cpp
b/clang/lib/Format/TokenAnalyzer.cpp
index 207442fe0c2c0..6ba3b05312607 100644
--- a/clang/lib/Format/TokenAnalyzer.cpp
+++ b/clang/lib/Format/TokenAnalyzer.cpp
@@ -22,13 +22,10 @@
#include "UnwrappedLineParser.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Format/Format.h"
-#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Debug.h"
-#include <type_traits>
#define DEBUG_TYPE "format-formatter"
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index 963b9d2cd7c40..52100d195fe7a 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -14,7 +14,6 @@
#include "TokenAnnotator.h"
#include "FormatToken.h"
-#include "clang/Basic/SourceManager.h"
#include "clang/Basic/TokenKinds.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Support/Debug.h"
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp
b/clang/lib/Format/UnwrappedLineParser.cpp
index 2e138ff7ef59c..6c78f0b7dbd91 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -14,7 +14,6 @@
#include "UnwrappedLineParser.h"
#include "FormatToken.h"
-#include "FormatTokenLexer.h"
#include "FormatTokenSource.h"
#include "Macros.h"
#include "TokenAnnotator.h"
@@ -25,7 +24,6 @@
#include "llvm/Support/raw_os_ostream.h"
#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
#include <utility>
#define DEBUG_TYPE "format-parser"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
