Skip to content

Commit aef6361

Browse files
DougGregorDougGregor
committed
[SDK Overlays] Drop redundant "Error" from AppKit and CoreData CocoaError codes.
Fixes the rest of rdar://problem/27778189. (cherry picked from commit 24a361b)
1 parent fda1cf5 commit aef6361

File tree

2 files changed

+523
-57
lines changed

2 files changed

+523
-57
lines changed

‎stdlib/public/SDK/AppKit/NSError.swift

Lines changed: 128 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,138 @@
11
extension CocoaError.Code {
2+
public static var textReadInapplicableDocumentType: CocoaError.Code {
3+
return CocoaError.Code(rawValue: 65806)
4+
}
5+
public static var textWriteInapplicableDocumentType: CocoaError.Code {
6+
return CocoaError.Code(rawValue: 66062)
7+
}
8+
public static var serviceApplicationNotFound: CocoaError.Code {
9+
return CocoaError.Code(rawValue: 66560)
10+
}
11+
public static var serviceApplicationLaunchFailed: CocoaError.Code {
12+
return CocoaError.Code(rawValue: 66561)
13+
}
14+
public static var serviceRequestTimedOut: CocoaError.Code {
15+
return CocoaError.Code(rawValue: 66562)
16+
}
17+
public static var serviceInvalidPasteboardData: CocoaError.Code {
18+
return CocoaError.Code(rawValue: 66563)
19+
}
20+
public static var serviceMalformedServiceDictionary: CocoaError.Code {
21+
return CocoaError.Code(rawValue: 66564)
22+
}
23+
public static var serviceMiscellaneous: CocoaError.Code {
24+
return CocoaError.Code(rawValue: 66800)
25+
}
26+
public static var sharingServiceNotConfigured: CocoaError.Code {
27+
return CocoaError.Code(rawValue: 67072)
28+
}
29+
}
30+
31+
// Names deprecated late in Swift 3
32+
extension CocoaError.Code {
33+
@available(*, deprecated, renamed: "textReadInapplicableDocumentType")
234
public static var textReadInapplicableDocumentTypeError: CocoaError.Code {
335
return CocoaError.Code(rawValue: 65806)
436
}
37+
@available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
538
public static var textWriteInapplicableDocumentTypeError: CocoaError.Code {
639
return CocoaError.Code(rawValue: 66062)
740
}
41+
@available(*, deprecated, renamed: "serviceApplicationNotFound")
842
public static var serviceApplicationNotFoundError: CocoaError.Code {
943
return CocoaError.Code(rawValue: 66560)
1044
}
45+
@available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
1146
public static var serviceApplicationLaunchFailedError: CocoaError.Code {
1247
return CocoaError.Code(rawValue: 66561)
1348
}
49+
@available(*, deprecated, renamed: "serviceRequestTimedOut")
1450
public static var serviceRequestTimedOutError: CocoaError.Code {
1551
return CocoaError.Code(rawValue: 66562)
1652
}
53+
@available(*, deprecated, renamed: "serviceInvalidPasteboardData")
1754
public static var serviceInvalidPasteboardDataError: CocoaError.Code {
1855
return CocoaError.Code(rawValue: 66563)
1956
}
57+
@available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
2058
public static var serviceMalformedServiceDictionaryError: CocoaError.Code {
2159
return CocoaError.Code(rawValue: 66564)
2260
}
61+
@available(*, deprecated, renamed: "serviceMiscellaneous")
2362
public static var serviceMiscellaneousError: CocoaError.Code {
2463
return CocoaError.Code(rawValue: 66800)
2564
}
65+
@available(*, deprecated, renamed: "sharingServiceNotConfigured")
2666
public static var sharingServiceNotConfiguredError: CocoaError.Code {
2767
return CocoaError.Code(rawValue: 67072)
2868
}
2969
}
3070

3171
extension CocoaError {
72+
public static var textReadInapplicableDocumentType: CocoaError.Code {
73+
return CocoaError.Code(rawValue: 65806)
74+
}
75+
public static var textWriteInapplicableDocumentType: CocoaError.Code {
76+
return CocoaError.Code(rawValue: 66062)
77+
}
78+
public static var serviceApplicationNotFound: CocoaError.Code {
79+
return CocoaError.Code(rawValue: 66560)
80+
}
81+
public static var serviceApplicationLaunchFailed: CocoaError.Code {
82+
return CocoaError.Code(rawValue: 66561)
83+
}
84+
public static var serviceRequestTimedOut: CocoaError.Code {
85+
return CocoaError.Code(rawValue: 66562)
86+
}
87+
public static var serviceInvalidPasteboardData: CocoaError.Code {
88+
return CocoaError.Code(rawValue: 66563)
89+
}
90+
public static var serviceMalformedServiceDictionary: CocoaError.Code {
91+
return CocoaError.Code(rawValue: 66564)
92+
}
93+
public static var serviceMiscellaneous: CocoaError.Code {
94+
return CocoaError.Code(rawValue: 66800)
95+
}
96+
public static var sharingServiceNotConfigured: CocoaError.Code {
97+
return CocoaError.Code(rawValue: 67072)
98+
}
99+
}
100+
101+
// Names deprecated late in Swift 3
102+
extension CocoaError {
103+
@available(*, deprecated, renamed: "textReadInapplicableDocumentType")
32104
public static var textReadInapplicableDocumentTypeError: CocoaError.Code {
33105
return CocoaError.Code(rawValue: 65806)
34106
}
107+
@available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
35108
public static var textWriteInapplicableDocumentTypeError: CocoaError.Code {
36109
return CocoaError.Code(rawValue: 66062)
37110
}
111+
@available(*, deprecated, renamed: "serviceApplicationNotFound")
38112
public static var serviceApplicationNotFoundError: CocoaError.Code {
39113
return CocoaError.Code(rawValue: 66560)
40114
}
115+
@available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
41116
public static var serviceApplicationLaunchFailedError: CocoaError.Code {
42117
return CocoaError.Code(rawValue: 66561)
43118
}
119+
@available(*, deprecated, renamed: "serviceRequestTimedOut")
44120
public static var serviceRequestTimedOutError: CocoaError.Code {
45121
return CocoaError.Code(rawValue: 66562)
46122
}
123+
@available(*, deprecated, renamed: "serviceInvalidPasteboardData")
47124
public static var serviceInvalidPasteboardDataError: CocoaError.Code {
48125
return CocoaError.Code(rawValue: 66563)
49126
}
127+
@available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
50128
public static var serviceMalformedServiceDictionaryError: CocoaError.Code {
51129
return CocoaError.Code(rawValue: 66564)
52130
}
131+
@available(*, deprecated, renamed: "serviceMiscellaneous")
53132
public static var serviceMiscellaneousError: CocoaError.Code {
54133
return CocoaError.Code(rawValue: 66800)
55134
}
135+
@available(*, deprecated, renamed: "sharingServiceNotConfigured")
56136
public static var sharingServiceNotConfiguredError: CocoaError.Code {
57137
return CocoaError.Code(rawValue: 67072)
58138
}
@@ -72,40 +152,79 @@ extension CocoaError {
72152
}
73153
}
74154

155+
extension CocoaError {
156+
@available(*, deprecated, renamed: "textReadInapplicableDocumentType")
157+
public static var TextReadInapplicableDocumentTypeError: CocoaError.Code {
158+
return CocoaError.Code(rawValue: 65806)
159+
}
160+
@available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
161+
public static var TextWriteInapplicableDocumentTypeError: CocoaError.Code {
162+
return CocoaError.Code(rawValue: 66062)
163+
}
164+
@available(*, deprecated, renamed: "serviceApplicationNotFound")
165+
public static var ServiceApplicationNotFoundError: CocoaError.Code {
166+
return CocoaError.Code(rawValue: 66560)
167+
}
168+
@available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
169+
public static var ServiceApplicationLaunchFailedError: CocoaError.Code {
170+
return CocoaError.Code(rawValue: 66561)
171+
}
172+
@available(*, deprecated, renamed: "serviceRequestTimedOut")
173+
public static var ServiceRequestTimedOutError: CocoaError.Code {
174+
return CocoaError.Code(rawValue: 66562)
175+
}
176+
@available(*, deprecated, renamed: "serviceInvalidPasteboardData")
177+
public static var ServiceInvalidPasteboardDataError: CocoaError.Code {
178+
return CocoaError.Code(rawValue: 66563)
179+
}
180+
@available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
181+
public static var ServiceMalformedServiceDictionaryError: CocoaError.Code {
182+
return CocoaError.Code(rawValue: 66564)
183+
}
184+
@available(*, deprecated, renamed: "serviceMiscellaneous")
185+
public static var ServiceMiscellaneousError: CocoaError.Code {
186+
return CocoaError.Code(rawValue: 66800)
187+
}
188+
@available(*, deprecated, renamed: "sharingServiceNotConfigured")
189+
public static var SharingServiceNotConfiguredError: CocoaError.Code {
190+
return CocoaError.Code(rawValue: 67072)
191+
}
192+
}
193+
75194
extension CocoaError.Code {
76-
@swift3_migration(renamed: "textReadInapplicableDocumentTypeError")
195+
@available(*, deprecated, renamed: "textReadInapplicableDocumentType")
77196
public static var TextReadInapplicableDocumentTypeError: CocoaError.Code {
78197
return CocoaError.Code(rawValue: 65806)
79198
}
80-
@swift3_migration(renamed: "textWriteInapplicableDocumentTypeError")
199+
@available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
81200
public static var TextWriteInapplicableDocumentTypeError: CocoaError.Code {
82201
return CocoaError.Code(rawValue: 66062)
83202
}
84-
@swift3_migration(renamed: "serviceApplicationNotFoundError")
203+
@available(*, deprecated, renamed: "serviceApplicationNotFound")
85204
public static var ServiceApplicationNotFoundError: CocoaError.Code {
86205
return CocoaError.Code(rawValue: 66560)
87206
}
88-
@swift3_migration(renamed: "serviceApplicationLaunchFailedError")
207+
@available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
89208
public static var ServiceApplicationLaunchFailedError: CocoaError.Code {
90209
return CocoaError.Code(rawValue: 66561)
91210
}
92-
@swift3_migration(renamed: "serviceRequestTimedOutError")
211+
@available(*, deprecated, renamed: "serviceRequestTimedOut")
93212
public static var ServiceRequestTimedOutError: CocoaError.Code {
94213
return CocoaError.Code(rawValue: 66562)
95214
}
96-
@swift3_migration(renamed: "serviceInvalidPasteboardDataError")
215+
@available(*, deprecated, renamed: "serviceInvalidPasteboardData")
97216
public static var ServiceInvalidPasteboardDataError: CocoaError.Code {
98217
return CocoaError.Code(rawValue: 66563)
99218
}
100-
@swift3_migration(renamed: "serviceMalformedServiceDictionaryError")
219+
@available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
101220
public static var ServiceMalformedServiceDictionaryError: CocoaError.Code {
102221
return CocoaError.Code(rawValue: 66564)
103222
}
104-
@swift3_migration(renamed: "serviceMiscellaneousError")
223+
@available(*, deprecated, renamed: "serviceMiscellaneous")
105224
public static var ServiceMiscellaneousError: CocoaError.Code {
106225
return CocoaError.Code(rawValue: 66800)
107226
}
108-
@swift3_migration(renamed: "sharingServiceNotConfiguredError")
227+
@available(*, deprecated, renamed: "sharingServiceNotConfigured")
109228
public static var SharingServiceNotConfiguredError: CocoaError.Code {
110229
return CocoaError.Code(rawValue: 67072)
111230
}

0 commit comments

Comments
 (0)