Skip to content

Commit ab951c2

Browse files
committed
[ConstraintSystem] NFC: Move ConstraintGraph{Scope}.h to include/swift/Sema
1 parent f2614de commit ab951c2

File tree

10 files changed

+9
-10
lines changed

10 files changed

+9
-10
lines changed
File renamed without changes.

lib/Sema/CSBindings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// This file implements selection of bindings for type variables.
1414
//
1515
//===----------------------------------------------------------------------===//
16-
#include "ConstraintGraph.h"
1716
#include "ConstraintSystem.h"
1817
#include "TypeChecker.h"
18+
#include "swift/Sema/ConstraintGraph.h"
1919
#include "llvm/ADT/SetVector.h"
2020
#include <tuple>
2121

lib/Sema/CSGen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// This file implements constraint generation for the type checker.
1414
//
1515
//===----------------------------------------------------------------------===//
16-
#include "ConstraintGraph.h"
1716
#include "ConstraintSystem.h"
1817
#include "TypeCheckType.h"
1918
#include "TypeChecker.h"
@@ -25,6 +24,7 @@
2524
#include "swift/AST/PrettyStackTrace.h"
2625
#include "swift/AST/SubstitutionMap.h"
2726
#include "swift/AST/TypeCheckRequests.h"
27+
#include "swift/Sema/ConstraintGraph.h"
2828
#include "swift/Sema/IDETypeChecking.h"
2929
#include "swift/Subsystems.h"
3030
#include "llvm/ADT/APInt.h"

lib/Sema/CSSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616
#include "CSStep.h"
17-
#include "ConstraintGraph.h"
1817
#include "ConstraintSystem.h"
1918
#include "TypeCheckType.h"
2019
#include "TypeChecker.h"
2120
#include "swift/AST/ParameterList.h"
2221
#include "swift/AST/TypeWalker.h"
22+
#include "swift/Sema/ConstraintGraph.h"
2323
#include "swift/Sema/SolutionResult.h"
2424
#include "llvm/ADT/STLExtras.h"
2525
#include "llvm/ADT/SetVector.h"

lib/Sema/CSStep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#define SWIFT_SEMA_CSSTEP_H
2020

2121
#include "Constraint.h"
22-
#include "ConstraintGraph.h"
2322
#include "ConstraintSystem.h"
2423
#include "swift/AST/Types.h"
24+
#include "swift/Sema/ConstraintGraph.h"
2525
#include "llvm/ADT/ArrayRef.h"
2626
#include "llvm/ADT/Optional.h"
2727
#include "llvm/ADT/STLExtras.h"

lib/Sema/ConstraintGraph.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
//
1616
//===----------------------------------------------------------------------===//
1717

18-
#include "ConstraintGraph.h"
19-
#include "ConstraintGraphScope.h"
2018
#include "ConstraintSystem.h"
2119
#include "swift/Basic/Statistic.h"
20+
#include "swift/Sema/ConstraintGraph.h"
21+
#include "swift/Sema/ConstraintGraphScope.h"
2222
#include "llvm/ADT/SetVector.h"
2323
#include "llvm/Support/Debug.h"
2424
#include "llvm/Support/SaveAndRestore.h"

lib/Sema/ConstraintSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//
1717
//===----------------------------------------------------------------------===//
1818
#include "ConstraintSystem.h"
19-
#include "ConstraintGraph.h"
2019
#include "CSDiagnostics.h"
2120
#include "CSFix.h"
2221
#include "TypeChecker.h"
@@ -26,6 +25,7 @@
2625
#include "swift/AST/ParameterList.h"
2726
#include "swift/AST/TypeCheckRequests.h"
2827
#include "swift/Basic/Statistic.h"
28+
#include "swift/Sema/ConstraintGraph.h"
2929
#include "swift/Sema/SolutionResult.h"
3030
#include "llvm/ADT/SetVector.h"
3131
#include "llvm/ADT/SmallSet.h"

lib/Sema/ConstraintSystem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
#include "CSFix.h"
2222
#include "Constraint.h"
23-
#include "ConstraintGraph.h"
24-
#include "ConstraintGraphScope.h"
2523
#include "swift/AST/ASTContext.h"
2624
#include "swift/AST/ASTNode.h"
2725
#include "swift/AST/ASTVisitor.h"
@@ -34,6 +32,8 @@
3432
#include "swift/Basic/Debug.h"
3533
#include "swift/Basic/LLVM.h"
3634
#include "swift/Basic/OptionSet.h"
35+
#include "swift/Sema/ConstraintGraph.h"
36+
#include "swift/Sema/ConstraintGraphScope.h"
3737
#include "swift/Sema/ConstraintLocator.h"
3838
#include "swift/Sema/OverloadChoice.h"
3939
#include "swift/Sema/SolutionResult.h"

lib/Sema/IDETypeCheckingRequests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "swift/Sema/IDETypeCheckingRequests.h"
1919
#include "swift/Subsystems.h"
2020
#include "TypeChecker.h"
21-
#include "ConstraintGraph.h"
2221
#include "ConstraintSystem.h"
2322

2423
using namespace swift;

0 commit comments

Comments
 (0)