Skip to content

Commit 57916e4

Browse files
committed
Loosen RawRepresentable test ordering requirements
Several tests implicitly depended on the order of declarations in RawRepresentable. This change loosens their requirements.
1 parent 4f25c55 commit 57916e4

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

test/IDE/print_ast_tc_decls.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,10 +1072,10 @@ enum d2300_EnumDeclWithValues1 : Int {
10721072
// PASS_COMMON: {{^}}enum d2300_EnumDeclWithValues1 : Int {{{$}}
10731073
// PASS_COMMON-NEXT: {{^}} case EDV2_First{{$}}
10741074
// PASS_COMMON-NEXT: {{^}} case EDV2_Second{{$}}
1075-
// PASS_COMMON-NEXT: {{^}} typealias RawValue = Int
1076-
// PASS_COMMON-NEXT: {{^}} init?(rawValue: Int){{$}}
1077-
// PASS_COMMON-NEXT: {{^}} var rawValue: Int { get }{{$}}
1078-
// PASS_COMMON-NEXT: {{^}}}{{$}}
1075+
// PASS_COMMON-DAG: {{^}} typealias RawValue = Int
1076+
// PASS_COMMON-DAG: {{^}} init?(rawValue: Int){{$}}
1077+
// PASS_COMMON-DAG: {{^}} var rawValue: Int { get }{{$}}
1078+
// PASS_COMMON: {{^}}}{{$}}
10791079

10801080
enum d2400_EnumDeclWithValues2 : Double {
10811081
case EDV3_First = 10
@@ -1084,10 +1084,10 @@ enum d2400_EnumDeclWithValues2 : Double {
10841084
// PASS_COMMON: {{^}}enum d2400_EnumDeclWithValues2 : Double {{{$}}
10851085
// PASS_COMMON-NEXT: {{^}} case EDV3_First{{$}}
10861086
// PASS_COMMON-NEXT: {{^}} case EDV3_Second{{$}}
1087-
// PASS_COMMON-NEXT: {{^}} typealias RawValue = Double
1088-
// PASS_COMMON-NEXT: {{^}} init?(rawValue: Double){{$}}
1089-
// PASS_COMMON-NEXT: {{^}} var rawValue: Double { get }{{$}}
1090-
// PASS_COMMON-NEXT: {{^}}}{{$}}
1087+
// PASS_COMMON-DAG: {{^}} typealias RawValue = Double
1088+
// PASS_COMMON-DAG: {{^}} init?(rawValue: Double){{$}}
1089+
// PASS_COMMON-DAG: {{^}} var rawValue: Double { get }{{$}}
1090+
// PASS_COMMON: {{^}}}{{$}}
10911091

10921092
//===---
10931093
//===--- Custom operator printing.

test/ParseableInterface/synthesized.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
public enum HasRawValue: Int {
55
// CHECK-NEXT: case a, b, c
66
case a, b = 5, c
7-
// CHECK-NEXT: public typealias RawValue = Swift.Int
8-
// CHECK-NEXT: @inlinable public init?(rawValue: Swift.Int)
9-
// CHECK-NEXT: public var rawValue: Swift.Int {
10-
// CHECK-NEXT: @inlinable get{{$}}
11-
// CHECK-NEXT: }
12-
} // CHECK-NEXT: {{^}$}}
7+
// CHECK-DAG: public typealias RawValue = Swift.Int
8+
// CHECK-DAG: @inlinable public init?(rawValue: Swift.Int)
9+
// CHECK-DAG: public var rawValue: Swift.Int {
10+
// CHECK-DAG: @inlinable get{{$}}
11+
// CHECK-DAG: }
12+
} // CHECK: {{^}$}}
1313

1414
// CHECK-LABEL: @objc public enum ObjCEnum : Int {
1515
@objc public enum ObjCEnum: Int {
1616
// CHECK-NEXT: case a, b, c
1717
case a, b = 5, c
18-
// CHECK-NEXT: public typealias RawValue = Swift.Int
19-
// CHECK-NEXT: @inlinable public init?(rawValue: Swift.Int)
20-
// CHECK-NEXT: public var rawValue: Swift.Int {
21-
// CHECK-NEXT: @inlinable get{{$}}
22-
// CHECK-NEXT: }
23-
} // CHECK-NEXT: {{^}$}}
18+
// CHECK-DAG: public typealias RawValue = Swift.Int
19+
// CHECK-DAG: @inlinable public init?(rawValue: Swift.Int)
20+
// CHECK-DAG: public var rawValue: Swift.Int {
21+
// CHECK-DAG: @inlinable get{{$}}
22+
// CHECK-DAG: }
23+
} // CHECK: {{^}$}}

0 commit comments

Comments
 (0)