Merge pull request swiftlang#34235 from xedin/cs-header-to-include

[ConstraintSystem] NFC: Move `ConstraintSystem.h` and related headers to `include/swift/Sema`

Author: xedin

include/swift/AST/FunctionRefKind.h

@@ -17,6 +17,8 @@
 #ifndef SWIFT_AST_FUNCTION_REF_KIND_H
 #define SWIFT_AST_FUNCTION_REF_KIND_H
 
+#include "llvm/ADT/StringRef.h"
+
 namespace swift {
 
 /// Describes how a function is referenced within an expression node,
@@ -43,7 +45,7 @@ enum class FunctionRefKind : unsigned {
 
 /// Produce a string describing a function reference kind, for
 /// debugging purposes.
-StringRef getFunctionRefKindStr(FunctionRefKind refKind);
+llvm::StringRef getFunctionRefKindStr(FunctionRefKind refKind);
 
 }
 

lib/Sema/CSFix.h renamed to include/swift/Sema/CSFix.h

@@ -17,14 +17,14 @@
 #ifndef SWIFT_SEMA_CSFIX_H
 #define SWIFT_SEMA_CSFIX_H
 
-#include "ConstraintLocator.h"
 #include "swift/AST/ASTNode.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/Identifier.h"
 #include "swift/AST/Type.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/Debug.h"
+#include "swift/Sema/ConstraintLocator.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/TrailingObjects.h"

lib/Sema/Constraint.h renamed to include/swift/Sema/Constraint.h

@@ -18,12 +18,11 @@
 #ifndef SWIFT_SEMA_CONSTRAINT_H
 #define SWIFT_SEMA_CONSTRAINT_H
 
-#include "CSFix.h"
-#include "OverloadChoice.h"
 #include "swift/AST/FunctionRefKind.h"
 #include "swift/AST/Identifier.h"
 #include "swift/AST/Type.h"
 #include "swift/Basic/Debug.h"
+#include "swift/Sema/OverloadChoice.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/ilist.h"
 #include "llvm/ADT/ilist_node.h"
@@ -43,6 +42,7 @@ class TypeVariableType;
 
 namespace constraints {
 
+class ConstraintFix;
 class ConstraintLocator;
 class ConstraintSystem;
 enum class TrailingClosureMatching;

lib/Sema/ConstraintGraph.h renamed to include/swift/Sema/ConstraintGraph.h

@@ -18,13 +18,6 @@
 #ifndef SWIFT_SEMA_CONSTRAINT_SYSTEM_H
 #define SWIFT_SEMA_CONSTRAINT_SYSTEM_H
 
-#include "CSFix.h"
-#include "Constraint.h"
-#include "ConstraintGraph.h"
-#include "ConstraintGraphScope.h"
-#include "ConstraintLocator.h"
-#include "OverloadChoice.h"
-#include "SolutionResult.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTNode.h"
 #include "swift/AST/ASTVisitor.h"
@@ -37,6 +30,13 @@
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/OptionSet.h"
+#include "swift/Sema/Constraint.h"
+#include "swift/Sema/ConstraintGraph.h"
+#include "swift/Sema/ConstraintGraphScope.h"
+#include "swift/Sema/ConstraintLocator.h"
+#include "swift/Sema/CSFix.h"
+#include "swift/Sema/OverloadChoice.h"
+#include "swift/Sema/SolutionResult.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/PointerUnion.h"
 #include "llvm/ADT/STLExtras.h"