RequirementMachine: Move RequirementMachine.h to lib/AST/RequirementMachine

Author: slavapestov

lib/AST/ASTContext.cpp

@@ -41,7 +41,6 @@
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/RawComment.h"
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/SILLayout.h"
 #include "swift/AST/SemanticAttrs.h"
 #include "swift/AST/SourceFile.h"
@@ -67,6 +66,7 @@
 #include <algorithm>
 #include <memory>
 
+#include "RequirementMachine/RequirementMachine.h"
 #include "RequirementMachine/RewriteContext.h"
 
 using namespace swift;

lib/AST/GenericSignature.cpp

@@ -22,9 +22,9 @@
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/PrettyStackTrace.h"
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/STLExtras.h"
+#include "RequirementMachine/RequirementMachine.h"
 #include <functional>
 
 using namespace swift;

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -14,14 +14,14 @@
 // Use those methods instead of calling into the RequirementMachine directly.
 //
 //===----------------------------------------------------------------------===//
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/Module.h"
 #include "llvm/ADT/TinyPtrVector.h"
 #include <vector>
 
+#include "RequirementMachine.h"
 #include "RequirementMachineImpl.h"
 #include "PropertyMap.h"
 #include "ProtocolGraph.h"

lib/AST/RequirementMachine/RequirementMachine.cpp

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericSignature.h"
@@ -21,9 +20,10 @@
 
 #include "PropertyMap.h"
 #include "ProtocolGraph.h"
+#include "RequirementMachine.h"
+#include "RequirementMachineImpl.h"
 #include "RewriteContext.h"
 #include "RewriteSystem.h"
-#include "RequirementMachineImpl.h"
 
 using namespace swift;
 using namespace rewriting;

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

@@ -13,12 +13,12 @@
 #ifndef SWIFT_REQUIREMENTMACHINEIMPL_H
 #define SWIFT_REQUIREMENTMACHINEIMPL_H
 
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/GenericSignature.h"
 
 #include "llvm/ADT/DenseMap.h"
 #include <vector>
 
+#include "RequirementMachine.h"
 #include "PropertyMap.h"
 #include "ProtocolGraph.h"
 #include "RewriteContext.h"