Skip to content

Commit a2641e7

Browse files
CodaFiCodaFi
committed
[NFC] Sort the requests
This should curtail merge conflicts in the future
1 parent a19a70e commit a2641e7

File tree

5 files changed

+51
-46
lines changed

5 files changed

+51
-46
lines changed

‎include/swift/AST/AccessTypeIDZone.def

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17+
1718
SWIFT_REQUEST(AccessControl, AccessLevelRequest)
18-
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest)
1919
SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest)
20+
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest)

‎include/swift/AST/NameLookupTypeIDZone.def

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest)
18-
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest)
19-
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest)
17+
18+
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest)
2019
SWIFT_REQUEST(NameLookup, ExtendedNominalRequest)
20+
SWIFT_REQUEST(NameLookup, GetDestructorRequest)
21+
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest)
2122
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest)
23+
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest)
2224
SWIFT_REQUEST(NameLookup, TypeDeclsFromWhereClauseRequest)
23-
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest)
24-
SWIFT_REQUEST(NameLookup, GetDestructorRequest)
25+
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest)
26+

‎include/swift/AST/TypeCheckerTypeIDZone.def

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

18-
SWIFT_REQUEST(TypeChecker, InheritedTypeRequest)
19-
SWIFT_REQUEST(TypeChecker, SuperclassTypeRequest)
18+
SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequest)
19+
SWIFT_REQUEST(TypeChecker, AttachedFunctionBuilderRequest)
20+
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrapperTypeRequest)
21+
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest)
22+
SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest)
23+
SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest)
24+
SWIFT_REQUEST(TypeChecker, DefaultTypeRequest)
25+
SWIFT_REQUEST(TypeChecker, EmittedMembersRequest)
2026
SWIFT_REQUEST(TypeChecker, EnumRawTypeRequest)
21-
SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest)
22-
SWIFT_REQUEST(TypeChecker, IsObjCRequest)
23-
SWIFT_REQUEST(TypeChecker, InitKindRequest)
24-
SWIFT_REQUEST(TypeChecker, ProtocolRequiresClassRequest)
2527
SWIFT_REQUEST(TypeChecker, ExistentialConformsToSelfRequest)
2628
SWIFT_REQUEST(TypeChecker, ExistentialTypeSupportedRequest)
27-
SWIFT_REQUEST(TypeChecker, IsFinalRequest)
28-
SWIFT_REQUEST(TypeChecker, IsDynamicRequest)
29-
SWIFT_REQUEST(TypeChecker, RequirementRequest)
30-
SWIFT_REQUEST(TypeChecker, RequirementSignatureRequest)
31-
SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest)
32-
SWIFT_REQUEST(TypeChecker, USRGenerationRequest)
33-
SWIFT_REQUEST(TypeChecker, StructuralTypeRequest)
34-
SWIFT_REQUEST(TypeChecker, ResilienceExpansionRequest)
35-
SWIFT_REQUEST(TypeChecker, DefaultTypeRequest)
36-
SWIFT_REQUEST(TypeChecker, MangleLocalTypeDeclRequest)
37-
SWIFT_REQUEST(TypeChecker, PropertyWrapperTypeInfoRequest)
38-
SWIFT_REQUEST(TypeChecker, PropertyWrapperMutabilityRequest)
39-
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest)
40-
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrapperTypeRequest)
41-
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyTypeRequest)
42-
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyInfoRequest)
43-
SWIFT_REQUEST(TypeChecker, AttachedFunctionBuilderRequest)
29+
SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest)
4430
SWIFT_REQUEST(TypeChecker, FunctionBuilderTypeRequest)
45-
SWIFT_REQUEST(TypeChecker, SelfAccessKindRequest)
31+
SWIFT_REQUEST(TypeChecker, FunctionOperatorRequest)
32+
SWIFT_REQUEST(TypeChecker, InheritedTypeRequest)
33+
SWIFT_REQUEST(TypeChecker, InitKindRequest)
34+
SWIFT_REQUEST(TypeChecker, IsAccessorTransparentRequest)
35+
SWIFT_REQUEST(TypeChecker, IsDynamicRequest)
36+
SWIFT_REQUEST(TypeChecker, IsFinalRequest)
4637
SWIFT_REQUEST(TypeChecker, IsGetterMutatingRequest)
38+
SWIFT_REQUEST(TypeChecker, IsImplicitlyUnwrappedOptionalRequest)
39+
SWIFT_REQUEST(TypeChecker, IsObjCRequest)
4740
SWIFT_REQUEST(TypeChecker, IsSetterMutatingRequest)
48-
SWIFT_REQUEST(TypeChecker, OpaqueReadOwnershipRequest)
4941
SWIFT_REQUEST(TypeChecker, LazyStoragePropertyRequest)
50-
SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyUntilRequest)
51-
SWIFT_REQUEST(TypeChecker, StoredPropertiesRequest)
52-
SWIFT_REQUEST(TypeChecker, StoredPropertiesAndMissingMembersRequest)
53-
SWIFT_REQUEST(TypeChecker, StorageImplInfoRequest)
42+
SWIFT_REQUEST(TypeChecker, MangleLocalTypeDeclRequest)
43+
SWIFT_REQUEST(TypeChecker, OpaqueReadOwnershipRequest)
44+
SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest)
45+
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyInfoRequest)
46+
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyTypeRequest)
47+
SWIFT_REQUEST(TypeChecker, PropertyWrapperMutabilityRequest)
48+
SWIFT_REQUEST(TypeChecker, PropertyWrapperTypeInfoRequest)
49+
SWIFT_REQUEST(TypeChecker, ProtocolRequiresClassRequest)
50+
SWIFT_REQUEST(TypeChecker, RequirementRequest)
51+
SWIFT_REQUEST(TypeChecker, RequirementSignatureRequest)
5452
SWIFT_REQUEST(TypeChecker, RequiresOpaqueAccessorsRequest)
5553
SWIFT_REQUEST(TypeChecker, RequiresOpaqueModifyCoroutineRequest)
56-
SWIFT_REQUEST(TypeChecker, IsAccessorTransparentRequest)
54+
SWIFT_REQUEST(TypeChecker, ResilienceExpansionRequest)
55+
SWIFT_REQUEST(TypeChecker, SelfAccessKindRequest)
56+
SWIFT_REQUEST(TypeChecker, StorageImplInfoRequest)
57+
SWIFT_REQUEST(TypeChecker, StoredPropertiesAndMissingMembersRequest)
58+
SWIFT_REQUEST(TypeChecker, StoredPropertiesRequest)
59+
SWIFT_REQUEST(TypeChecker, StructuralTypeRequest)
60+
SWIFT_REQUEST(TypeChecker, SuperclassTypeRequest)
5761
SWIFT_REQUEST(TypeChecker, SynthesizeAccessorRequest)
58-
SWIFT_REQUEST(TypeChecker, EmittedMembersRequest)
59-
SWIFT_REQUEST(TypeChecker, IsImplicitlyUnwrappedOptionalRequest)
60-
SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest)
61-
SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequest)
62-
SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest)
63-
SWIFT_REQUEST(TypeChecker, FunctionOperatorRequest)
62+
SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyUntilRequest)
63+
SWIFT_REQUEST(TypeChecker, USRGenerationRequest)

‎include/swift/IDE/IDERequestIDZone.def

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17+
18+
SWIFT_REQUEST(IDE, CollectOverriddenDeclsRequest)
1719
SWIFT_REQUEST(IDE, CursorInfoRequest)
18-
SWIFT_REQUEST(IDE, RangeInfoRequest)
1920
SWIFT_REQUEST(IDE, ProvideDefaultImplForRequest)
20-
SWIFT_REQUEST(IDE, CollectOverriddenDeclsRequest)
21+
SWIFT_REQUEST(IDE, RangeInfoRequest)
2122
SWIFT_REQUEST(IDE, ResolveProtocolNameRequest)

‎include/swift/Sema/IDETypeCheckingRequestIDZone.def

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17+
18+
SWIFT_REQUEST(IDETypeChecking, HasDynamicMemberLookupAttributeRequest)
1719
SWIFT_REQUEST(IDETypeChecking, IsDeclApplicableRequest)
18-
SWIFT_REQUEST(IDETypeChecking, TypeRelationCheckRequest)
1920
SWIFT_REQUEST(IDETypeChecking, RootAndResultTypeOfKeypathDynamicMemberRequest)
2021
SWIFT_REQUEST(IDETypeChecking, RootTypeOfKeypathDynamicMemberRequest)
21-
SWIFT_REQUEST(IDETypeChecking, HasDynamicMemberLookupAttributeRequest)
22+
SWIFT_REQUEST(IDETypeChecking, TypeRelationCheckRequest)

0 commit comments

Comments
 (0)