AST: Move GenericSignatureBuilder.h from include/swift/AST/ to lib/AST/

Author: slavapestov

lib/AST/ASTContext.cpp

@@ -17,6 +17,7 @@
 #include "swift/AST/ASTContext.h"
 #include "ClangTypeConverter.h"
 #include "ForeignRepresentationInfo.h"
+#include "GenericSignatureBuilder.h"
 #include "SubstitutionMapStorage.h"
 #include "swift/AST/ClangModuleLoader.h"
 #include "swift/AST/ConcreteDeclRef.h"
@@ -28,7 +29,6 @@
 #include "swift/AST/ForeignErrorConvention.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/GenericSignature.h"
-#include "swift/AST/GenericSignatureBuilder.h"
 #include "swift/AST/ImportCache.h"
 #include "swift/AST/IndexSubset.h"
 #include "swift/AST/KnownProtocols.h"

lib/AST/GenericSignature.cpp

@@ -14,10 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "GenericSignatureBuilderImpl.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/ASTContext.h"
-#include "swift/AST/GenericSignatureBuilder.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/Module.h"
@@ -26,6 +24,8 @@
 #include "swift/AST/Types.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/STLExtras.h"
+#include "GenericSignatureBuilder.h"
+#include "GenericSignatureBuilderImpl.h"
 #include "RequirementMachine/RequirementMachine.h"
 #include <functional>
 
@@ -1862,4 +1862,4 @@ swift::buildGenericSignature(ASTContext &ctx,
         addedParameters,
         addedRequirements},
       GenericSignatureWithError()).getPointer();
-}
+}

lib/AST/GenericSignatureBuilder.cpp

@@ -17,7 +17,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "GenericSignatureBuilderImpl.h"
-#include "swift/AST/GenericSignatureBuilder.h"
+#include "GenericSignatureBuilder.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/DiagnosticsSema.h"
 #include "swift/AST/DiagnosticEngine.h"

include/swift/AST/GenericSignatureBuilder.h renamed to lib/AST/GenericSignatureBuilder.h

@@ -8,7 +8,7 @@
 #ifndef SWIFT_AST_GENERIC_SIGNATURE_BUILDER_IMPL_H
 #define SWIFT_AST_GENERIC_SIGNATURE_BUILDER_IMPL_H
 
-#include "swift/AST/GenericSignatureBuilder.h"
+#include "GenericSignatureBuilder.h"
 
 namespace swift {
 

lib/AST/GenericSignatureBuilderImpl.h

@@ -21,13 +21,13 @@
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericSignature.h"
-#include "swift/AST/GenericSignatureBuilder.h"
 #include "swift/AST/LazyResolver.h"
 #include "swift/AST/Requirement.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Statistic.h"
 #include <vector>
 
+#include "../GenericSignatureBuilder.h" // FIXME: This is temporary
 #include "RequirementMachine.h"
 
 using namespace swift;