Skip to content

Commit 2419112

Browse files
varungandhi-applevarungandhi-apple
authored
Merge pull request #32080 from varungandhi-apple/vg-tidying-up-without-marie-kondo
Get rid of #includes that do not spark joy
2 parents db0c39f + 77dbf62 commit 2419112

File tree

80 files changed

+28
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+28
-79
lines changed

‎include/swift/AST/ASTPrinter.h

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "swift/Basic/QuotedString.h"
1818
#include "swift/Basic/UUID.h"
1919
#include "swift/AST/Identifier.h"
20+
#include "llvm/ADT/SmallString.h"
2021
#include "llvm/ADT/StringRef.h"
2122
#include "llvm/ADT/DenseSet.h"
2223
#include "llvm/Support/raw_ostream.h"

‎include/swift/AST/AnyRequest.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "swift/Basic/TypeID.h"
2323
#include "llvm/ADT/DenseMapInfo.h"
2424
#include "llvm/ADT/Hashing.h"
25+
#include "llvm/ADT/PointerIntPair.h"
2526
#include <string>
2627

2728
namespace llvm {

‎include/swift/AST/CaptureInfo.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "llvm/ADT/PointerIntPair.h"
2323
#include "llvm/ADT/PointerUnion.h"
2424
#include "llvm/Support/TrailingObjects.h"
25-
#include <vector>
2625

2726
namespace swift {
2827
class CapturedValue;

‎include/swift/AST/ConcreteDeclRef.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "swift/Basic/LLVM.h"
2222
#include "swift/AST/SubstitutionMap.h"
2323
#include "swift/AST/TypeAlignments.h"
24-
#include "llvm/ADT/ArrayRef.h"
2524
#include "llvm/ADT/PointerUnion.h"
2625
#include "llvm/Support/Compiler.h"
2726
#include <cstring>

‎include/swift/AST/Decl.h

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "swift/Basic/OptionalEnum.h"
4242
#include "swift/Basic/Range.h"
4343
#include "swift/Basic/Located.h"
44-
#include "llvm/ADT/DenseMap.h"
4544
#include "llvm/ADT/DenseSet.h"
4645
#include "llvm/Support/TrailingObjects.h"
4746
#include <type_traits>

‎include/swift/AST/ExistentialLayout.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "swift/Basic/ArrayRefView.h"
2121
#include "swift/AST/ASTContext.h"
2222
#include "swift/AST/Type.h"
23-
#include "llvm/ADT/SmallVector.h"
2423

2524
namespace swift {
2625
class ProtocolDecl;

‎include/swift/AST/GenericParamKey.h

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#define SWIFT_AST_GENERICPARAMKEY_H
1515

1616
#include "llvm/ADT/DenseMapInfo.h"
17-
#include "llvm/ADT/ArrayRef.h"
1817
#include "swift/AST/Type.h"
1918

2019
namespace swift {

‎include/swift/AST/GenericSignatureBuilder.h

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "swift/AST/TypeRepr.h"
3131
#include "swift/Basic/Debug.h"
3232
#include "swift/Basic/LLVM.h"
33-
#include "llvm/ADT/ArrayRef.h"
3433
#include "llvm/ADT/FoldingSet.h"
3534
#include "llvm/ADT/ilist.h"
3635
#include "llvm/ADT/PointerUnion.h"

‎include/swift/AST/LinkLibrary.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define SWIFT_AST_LINKLIBRARY_H
1515

1616
#include "swift/Basic/LLVM.h"
17-
#include "llvm/ADT/SmallString.h"
17+
#include "llvm/ADT/StringRef.h"
1818
#include <string>
1919

2020
namespace swift {

‎include/swift/AST/Module.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@
2828
#include "swift/Basic/STLExtras.h"
2929
#include "swift/Basic/SourceLoc.h"
3030
#include "llvm/ADT/ArrayRef.h"
31-
#include "llvm/ADT/DenseSet.h"
3231
#include "llvm/ADT/STLExtras.h"
33-
#include "llvm/ADT/SetVector.h"
34-
#include "llvm/ADT/SmallSet.h"
3532
#include "llvm/ADT/SmallVector.h"
3633
#include "llvm/ADT/StringMap.h"
37-
#include "llvm/ADT/TinyPtrVector.h"
3834
#include "llvm/Support/ErrorHandling.h"
3935
#include "llvm/Support/MD5.h"
36+
#include <set>
4037

4138
namespace clang {
4239
class Module;

‎include/swift/AST/ModuleDependencies.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "swift/Basic/LLVM.h"
2222
#include "llvm/ADT/ArrayRef.h"
23-
#include "llvm/ADT/DenseMap.h"
2423
#include "llvm/ADT/Optional.h"
2524
#include "llvm/ADT/StringSet.h"
2625
#include <string>

‎include/swift/AST/ModuleLoader.h

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "swift/Basic/Located.h"
2323
#include "swift/Basic/SourceLoc.h"
2424
#include "llvm/ADT/SetVector.h"
25-
#include "llvm/ADT/SmallSet.h"
26-
#include "llvm/ADT/StringSet.h"
2725
#include "llvm/ADT/TinyPtrVector.h"
2826
#include "swift/AST/ModuleDependencies.h"
2927

‎include/swift/AST/NameLookup.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifndef SWIFT_AST_NAME_LOOKUP_H
1818
#define SWIFT_AST_NAME_LOOKUP_H
1919

20-
#include "llvm/ADT/SmallPtrSet.h"
2120
#include "llvm/ADT/SmallVector.h"
2221
#include "swift/AST/ASTVisitor.h"
2322
#include "swift/AST/Identifier.h"

‎include/swift/AST/ProtocolConformance.h

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#include "llvm/ADT/ArrayRef.h"
2828
#include "llvm/ADT/DenseMap.h"
2929
#include "llvm/ADT/FoldingSet.h"
30-
#include "llvm/ADT/SmallPtrSet.h"
31-
#include "llvm/ADT/TinyPtrVector.h"
3230
#include <utility>
3331

3432
namespace swift {

‎include/swift/AST/SourceFile.h

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "swift/AST/FileUnit.h"
1717
#include "swift/AST/SynthesizedFileUnit.h"
1818
#include "swift/Basic/Debug.h"
19+
#include "llvm/ADT/SetVector.h"
20+
#include "llvm/ADT/SmallPtrSet.h"
1921

2022
namespace swift {
2123

‎include/swift/AST/Stmt.h

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "swift/AST/TypeAlignments.h"
2626
#include "swift/Basic/Debug.h"
2727
#include "swift/Basic/NullablePtr.h"
28-
#include "llvm/ADT/TinyPtrVector.h"
2928
#include "llvm/Support/TrailingObjects.h"
3029

3130
namespace swift {

‎include/swift/Basic/OutputFileMap.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/LLVM.h"
1818
#include "llvm/ADT/DenseMap.h"
1919
#include "llvm/ADT/StringMap.h"
20-
#include "llvm/ADT/StringSet.h"
2120
#include "llvm/Support/Error.h"
2221
#include "llvm/Support/MemoryBuffer.h"
2322
#include "llvm/Support/SourceMgr.h"

‎include/swift/Basic/SourceManager.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/SourceLoc.h"
1818
#include "clang/Basic/FileManager.h"
1919
#include "llvm/ADT/Optional.h"
20-
#include "llvm/ADT/StringMap.h"
2120
#include "llvm/Support/SourceMgr.h"
2221
#include <map>
2322

‎include/swift/Basic/SupplementaryOutputPaths.h

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#define SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H
1515

1616
#include "swift/Basic/LLVM.h"
17-
#include "llvm/ADT/Optional.h"
1817

1918
#include <string>
2019

‎include/swift/Basic/TypeID.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919
#ifndef SWIFT_BASIC_TYPEID_H
2020
#define SWIFT_BASIC_TYPEID_H
2121

22-
#include "llvm/ADT/StringRef.h"
22+
// NOTE: Most of these includes are for CTypeIDZone.def and DefineTypeIDZone.h.
23+
#include "llvm/ADT/ArrayRef.h"
2324
#include "llvm/ADT/TinyPtrVector.h"
25+
#include "llvm/ADT/StringRef.h"
2426
#include <cstdint>
27+
#include <memory>
2528
#include <string>
2629
#include <vector>
2730

‎include/swift/Basic/UUID.h

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "swift/Basic/LLVM.h"
2222
#include "llvm/ADT/DenseMap.h"
2323
#include "llvm/ADT/Optional.h"
24-
#include "llvm/ADT/SmallString.h"
25-
#include "llvm/ADT/StringRef.h"
2624
#include "llvm/Support/raw_ostream.h"
2725
#include <array>
2826

‎include/swift/Driver/Action.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/LLVM.h"
1818
#include "swift/Driver/Util.h"
1919
#include "llvm/ADT/ArrayRef.h"
20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/StringSwitch.h"
2221
#include "llvm/ADT/TinyPtrVector.h"
2322
#include "llvm/Support/Chrono.h"

‎include/swift/Driver/Compilation.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "swift/Driver/Driver.h"
2727
#include "swift/Driver/Job.h"
2828
#include "swift/Driver/Util.h"
29-
#include "llvm/ADT/DenseSet.h"
3029
#include "llvm/ADT/StringRef.h"
3130
#include "llvm/Support/Chrono.h"
3231

‎include/swift/Driver/Driver.h

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "swift/Basic/Sanitizers.h"
2626
#include "swift/Driver/Util.h"
2727
#include "llvm/ADT/DenseMap.h"
28-
#include "llvm/ADT/StringMap.h"
2928
#include "llvm/ADT/StringRef.h"
3029

3130
#include <functional>

‎include/swift/Driver/FineGrainedDependencyDriverGraph.h

-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
#include "swift/Basic/OptionSet.h"
2020
#include "swift/Driver/Job.h"
2121
#include "llvm/ADT/ArrayRef.h"
22-
#include "llvm/ADT/DenseMap.h"
2322
#include "llvm/ADT/STLExtras.h"
24-
#include "llvm/ADT/SmallPtrSet.h"
25-
#include "llvm/ADT/StringMap.h"
2623
#include "llvm/ADT/StringRef.h"
27-
#include "llvm/ADT/StringSet.h"
2824
#include "llvm/ADT/iterator_range.h"
2925
#include "llvm/Support/Path.h"
3026
#include "llvm/Support/PointerLikeTypeTraits.h"

‎include/swift/Driver/Job.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "swift/Driver/Action.h"
2121
#include "swift/Driver/Util.h"
2222
#include "llvm/ADT/ArrayRef.h"
23-
#include "llvm/ADT/DenseMap.h"
2423
#include "llvm/ADT/PointerIntPair.h"
2524
#include "llvm/ADT/SmallSet.h"
2625
#include "llvm/ADT/SmallVector.h"

‎include/swift/Frontend/FrontendInputsAndOutputs.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/SupplementaryOutputPaths.h"
1818
#include "swift/Frontend/InputFile.h"
1919
#include "llvm/ADT/Hashing.h"
20-
#include "llvm/ADT/MapVector.h"
2120

2221
#include <string>
2322
#include <vector>

‎include/swift/Frontend/InputFile.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/SupplementaryOutputPaths.h"
1818
#include "llvm/Support/MemoryBuffer.h"
1919
#include <string>
20-
#include <vector>
2120

2221
namespace swift {
2322

‎include/swift/IDE/CompletionInstance.h

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "swift/Frontend/Frontend.h"
1717
#include "llvm/ADT/Hashing.h"
1818
#include "llvm/ADT/IntrusiveRefCntPtr.h"
19-
#include "llvm/ADT/SmallString.h"
2019
#include "llvm/ADT/StringRef.h"
2120
#include "llvm/Support/Chrono.h"
2221
#include "llvm/Support/MemoryBuffer.h"

‎include/swift/IDE/SourceEntityWalker.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "swift/Basic/LLVM.h"
1818
#include "swift/Basic/SourceLoc.h"
1919
#include "llvm/ADT/PointerUnion.h"
20-
#include <string>
2120

2221
namespace clang {
2322
class Module;

‎include/swift/Index/IndexSymbol.h

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "swift/Basic/LLVM.h"
1717
#include "clang/Index/IndexSymbol.h"
18-
#include "llvm/ADT/SmallString.h"
1918

2019
namespace swift {
2120
class Decl;

‎include/swift/Migrator/FixitApplyDiagnosticConsumer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "swift/Migrator/Migrator.h"
2323
#include "swift/Migrator/Replacement.h"
2424
#include "clang/Rewrite/Core/RewriteBuffer.h"
25-
#include "llvm/ADT/DenseSet.h"
25+
#include "llvm/ADT/SmallSet.h"
2626

2727
namespace swift {
2828

‎include/swift/Parse/ParsedRawSyntaxNode.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "swift/Parse/ParsedTrivia.h"
1919
#include "swift/Parse/Token.h"
2020
#include "swift/Syntax/SyntaxKind.h"
21-
#include <vector>
2221

2322
namespace swift {
2423

‎include/swift/Parse/Parser.h

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "swift/Parse/SyntaxParsingContext.h"
3636
#include "swift/Syntax/References.h"
3737
#include "swift/Config.h"
38-
#include "llvm/ADT/SetVector.h"
3938

4039
namespace llvm {
4140
template <typename... PTs> class PointerUnion;

‎include/swift/Parse/PersistentParserState.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "swift/Basic/SourceLoc.h"
2121
#include "swift/Parse/LocalContext.h"
2222
#include "swift/Parse/Scope.h"
23-
#include "llvm/ADT/DenseMap.h"
2423

2524
namespace swift {
2625

‎include/swift/Parse/Scope.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "swift/AST/Identifier.h"
2222
#include "swift/Basic/Debug.h"
2323
#include "swift/Basic/TreeScopedHashTable.h"
24-
#include "llvm/ADT/SmallVector.h"
2524

2625
namespace swift {
2726
class ValueDecl;

‎include/swift/RemoteAST/RemoteAST.h

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "swift/Basic/LLVM.h"
2525
#include "swift/ABI/MetadataValues.h"
2626
#include "swift/AST/Type.h"
27-
#include "llvm/ADT/Optional.h"
2827
#include "llvm/ADT/StringRef.h"
2928

3029
#include <memory>

‎include/swift/SIL/LinearLifetimeChecker.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "swift/SIL/SILInstruction.h"
2020
#include "swift/SIL/SILValue.h"
2121
#include "llvm/ADT/SmallPtrSet.h"
22-
#include "llvm/ADT/SmallVector.h"
2322

2423
namespace swift {
2524

‎include/swift/SIL/Projection.h

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "llvm/ADT/Hashing.h"
3434
#include "llvm/ADT/Optional.h"
3535
#include "llvm/ADT/PointerIntPair.h"
36-
#include "llvm/ADT/SetVector.h"
3736
#include "llvm/Support/Allocator.h"
3837

3938
namespace swift {

‎include/swift/SIL/SILFunction.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "swift/SIL/SILDeclRef.h"
2727
#include "swift/SIL/SILLinkage.h"
2828
#include "swift/SIL/SILPrintContext.h"
29-
#include "llvm/ADT/StringMap.h"
3029

3130
/// The symbol name used for the program entry point function.
3231
#define SWIFT_ENTRY_POINT_FUNCTION "main"

‎include/swift/SIL/SILModule.h

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "llvm/ADT/ArrayRef.h"
4141
#include "llvm/ADT/FoldingSet.h"
4242
#include "llvm/ADT/MapVector.h"
43-
#include "llvm/ADT/Optional.h"
4443
#include "llvm/ADT/PointerIntPair.h"
4544
#include "llvm/ADT/SetVector.h"
4645
#include "llvm/ADT/ilist.h"

‎include/swift/SIL/SILWitnessTable.h

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "swift/AST/ProtocolConformanceRef.h"
2929
#include "llvm/ADT/ilist_node.h"
3030
#include "llvm/ADT/ilist.h"
31-
#include <string>
3231

3332
namespace swift {
3433

‎include/swift/SILOptimizer/Analysis/ARCAnalysis.h

-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
#include "swift/SILOptimizer/Analysis/AliasAnalysis.h"
2121
#include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
2222
#include "swift/SILOptimizer/Analysis/RCIdentityAnalysis.h"
23-
#include "llvm/ADT/BitVector.h"
2423
#include "llvm/ADT/MapVector.h"
25-
#include "llvm/ADT/SetVector.h"
26-
#include "llvm/ADT/SmallPtrSet.h"
2724
#include "llvm/ADT/TinyPtrVector.h"
2825

2926
namespace swift {

‎include/swift/SILOptimizer/Analysis/Analysis.h

-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
#include "swift/Basic/NullablePtr.h"
1717
#include "swift/SIL/Notifications.h"
1818
#include "llvm/ADT/DenseMap.h"
19-
#include "llvm/ADT/DenseSet.h"
20-
#include "llvm/ADT/Optional.h"
21-
#include "llvm/ADT/SmallVector.h"
2219
#include "llvm/Support/Casting.h"
23-
#include <vector>
2420

2521
namespace swift {
2622

‎include/swift/SILOptimizer/Analysis/CallerAnalysis.h

-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
#include "swift/SIL/SILModule.h"
1919
#include "swift/SILOptimizer/Analysis/Analysis.h"
2020
#include "swift/SILOptimizer/Utils/InstOptUtils.h"
21-
#include "llvm/ADT/ArrayRef.h"
2221
#include "llvm/ADT/DenseMap.h"
2322
#include "llvm/ADT/SmallSet.h"
24-
#include "llvm/ADT/TinyPtrVector.h"
2523

2624
namespace swift {
2725

0 commit comments

Comments
 (0)