Skip to content

Commit b088acb

Browse files
swift-ciswift-ci
authored
Merge pull request #24767 from ikesyo/remove-unnecessary-breaks
2 parents afcf4b6 + 6eead16 commit b088acb

File tree

3 files changed

+0
-76
lines changed

3 files changed

+0
-76
lines changed

‎stdlib/public/Darwin/Foundation/Data.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
15801580
precondition(range.lowerBound <= endIndex, "index \(range.lowerBound) is out of bounds of \(startIndex)..<\(endIndex)")
15811581
self = .large(LargeSlice(count: range.upperBound))
15821582
}
1583-
break
15841583
case .inline(var inline):
15851584
if inline.count < range.upperBound {
15861585
if InlineSlice.canStore(count: range.upperBound) {
@@ -1596,7 +1595,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
15961595
inline.resetBytes(in: range)
15971596
self = .inline(inline)
15981597
}
1599-
break
16001598
case .slice(var slice):
16011599
if InlineSlice.canStore(count: range.upperBound) {
16021600
self = .empty
@@ -1608,7 +1606,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16081606
newSlice.resetBytes(in: range)
16091607
self = .large(newSlice)
16101608
}
1611-
break
16121609
case .large(var slice):
16131610
self = .empty
16141611
slice.resetBytes(in: range)
@@ -1630,7 +1627,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16301627
} else {
16311628
self = .large(LargeSlice(UnsafeRawBufferPointer(start: bytes, count: cnt)))
16321629
}
1633-
break
16341630
case .inline(var inline):
16351631
let resultingCount = inline.count + cnt - (subrange.upperBound - subrange.lowerBound)
16361632
if resultingCount == 0 {
@@ -1647,7 +1643,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16471643
slice.replaceSubrange(subrange, with: bytes, count: cnt)
16481644
self = .large(slice)
16491645
}
1650-
break
16511646
case .slice(var slice):
16521647
let resultingUpper = slice.endIndex + cnt - (subrange.upperBound - subrange.lowerBound)
16531648
if slice.startIndex == 0 && resultingUpper == 0 {
@@ -1820,7 +1815,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
18201815
return
18211816
case .inline(let inline):
18221817
inline.copyBytes(to: pointer, from: range)
1823-
break
18241818
case .slice(let slice):
18251819
slice.copyBytes(to: pointer, from: range)
18261820
case .large(let slice):

‎stdlib/public/Darwin/Foundation/IndexPath.swift

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,12 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
3939
switch elements.count {
4040
case 0:
4141
self = .empty
42-
break
4342
case 1:
4443
self = .single(elements[0])
45-
break
4644
case 2:
4745
self = .pair(elements[0], elements[1])
48-
break
4946
default:
5047
self = .array(elements)
51-
break
5248
}
5349
}
5450

@@ -74,16 +70,12 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
7470
switch self {
7571
case .empty:
7672
self = .single(other)
77-
break
7873
case .single(let first):
7974
self = .pair(first, other)
80-
break
8175
case .pair(let first, let second):
8276
self = .array([first, second, other])
83-
break
8477
case .array(let indexes):
8578
self = .array(indexes + [other])
86-
break
8779
}
8880
}
8981

@@ -96,63 +88,47 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
9688
break
9789
case .single(let rhsIndex):
9890
self = .single(rhsIndex)
99-
break
10091
case .pair(let rhsFirst, let rhsSecond):
10192
self = .pair(rhsFirst, rhsSecond)
102-
break
10393
case .array(let rhsIndexes):
10494
self = .array(rhsIndexes)
105-
break
10695
}
107-
break
10896
case .single(let lhsIndex):
10997
switch other {
11098
case .empty:
11199
// DO NOTHING
112100
break
113101
case .single(let rhsIndex):
114102
self = .pair(lhsIndex, rhsIndex)
115-
break
116103
case .pair(let rhsFirst, let rhsSecond):
117104
self = .array([lhsIndex, rhsFirst, rhsSecond])
118-
break
119105
case .array(let rhsIndexes):
120106
self = .array([lhsIndex] + rhsIndexes)
121-
break
122107
}
123-
break
124108
case .pair(let lhsFirst, let lhsSecond):
125109
switch other {
126110
case .empty:
127111
// DO NOTHING
128112
break
129113
case .single(let rhsIndex):
130114
self = .array([lhsFirst, lhsSecond, rhsIndex])
131-
break
132115
case .pair(let rhsFirst, let rhsSecond):
133116
self = .array([lhsFirst, lhsSecond, rhsFirst, rhsSecond])
134-
break
135117
case .array(let rhsIndexes):
136118
self = .array([lhsFirst, lhsSecond] + rhsIndexes)
137-
break
138119
}
139-
break
140120
case .array(let lhsIndexes):
141121
switch other {
142122
case .empty:
143123
// DO NOTHING
144124
break
145125
case .single(let rhsIndex):
146126
self = .array(lhsIndexes + [rhsIndex])
147-
break
148127
case .pair(let rhsFirst, let rhsSecond):
149128
self = .array(lhsIndexes + [rhsFirst, rhsSecond])
150-
break
151129
case .array(let rhsIndexes):
152130
self = .array(lhsIndexes + rhsIndexes)
153-
break
154131
}
155-
break
156132
}
157133
}
158134

@@ -165,41 +141,31 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
165141
break
166142
case 1:
167143
self = .single(other[0])
168-
break
169144
case 2:
170145
self = .pair(other[0], other[1])
171-
break
172146
default:
173147
self = .array(other)
174-
break
175148
}
176-
break
177149
case .single(let first):
178150
switch other.count {
179151
case 0:
180152
// DO NOTHING
181153
break
182154
case 1:
183155
self = .pair(first, other[0])
184-
break
185156
default:
186157
self = .array([first] + other)
187-
break
188158
}
189-
break
190159
case .pair(let first, let second):
191160
switch other.count {
192161
case 0:
193162
// DO NOTHING
194163
break
195164
default:
196165
self = .array([first, second] + other)
197-
break
198166
}
199-
break
200167
case .array(let indexes):
201168
self = .array(indexes + other)
202-
break
203169
}
204170
}
205171

@@ -208,7 +174,6 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
208174
switch self {
209175
case .empty:
210176
fatalError("Index \(index) out of bounds of count 0")
211-
break
212177
case .single(let first):
213178
precondition(index == 0, "Index \(index) out of bounds of count 1")
214179
return first
@@ -223,24 +188,20 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
223188
switch self {
224189
case .empty:
225190
fatalError("Index \(index) out of bounds of count 0")
226-
break
227191
case .single(_):
228192
precondition(index == 0, "Index \(index) out of bounds of count 1")
229193
self = .single(newValue)
230-
break
231194
case .pair(let first, let second):
232195
precondition(index >= 0 && index < 2, "Index \(index) out of bounds of count 2")
233196
if index == 0 {
234197
self = .pair(newValue, second)
235198
} else {
236199
self = .pair(first, newValue)
237200
}
238-
break
239201
case .array(let indexes_):
240202
var indexes = indexes_
241203
indexes[index] = newValue
242204
self = .array(indexes)
243-
break
244205
}
245206
}
246207
}
@@ -266,7 +227,6 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
266227
fatalError("Range \(range) is out of bounds of count 1")
267228
}
268229
case .pair(let first, let second):
269-
270230
switch (range.lowerBound, range.upperBound) {
271231
case (0, 0):
272232
fallthrough
@@ -302,7 +262,6 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
302262
case .empty:
303263
precondition(range.lowerBound == 0 && range.upperBound == 0, "Range \(range) is out of bounds of count 0")
304264
self = newValue
305-
break
306265
case .single(let index):
307266
switch (range.lowerBound, range.upperBound, newValue) {
308267
case (0, 0, .empty):
@@ -311,13 +270,10 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
311270
break
312271
case (0, 0, .single(let other)):
313272
self = .pair(other, index)
314-
break
315273
case (0, 0, .pair(let first, let second)):
316274
self = .array([first, second, index])
317-
break
318275
case (0, 0, .array(let other)):
319276
self = .array(other + [index])
320-
break
321277
case (0, 1, .empty):
322278
fallthrough
323279
case (0, 1, .single):
@@ -328,13 +284,10 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
328284
self = newValue
329285
case (1, 1, .single(let other)):
330286
self = .pair(index, other)
331-
break
332287
case (1, 1, .pair(let first, let second)):
333288
self = .array([index, first, second])
334-
break
335289
case (1, 1, .array(let other)):
336290
self = .array([index] + other)
337-
break
338291
default:
339292
fatalError("Range \(range) is out of bounds of count 1")
340293
}
@@ -346,63 +299,46 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
346299
break
347300
case .single(let other):
348301
self = .array([other, first, second])
349-
break
350302
case .pair(let otherFirst, let otherSecond):
351303
self = .array([otherFirst, otherSecond, first, second])
352-
break
353304
case .array(let other):
354305
self = .array(other + [first, second])
355-
break
356306
}
357-
break
358307
case (0, 1):
359308
switch newValue {
360309
case .empty:
361310
self = .single(second)
362-
break
363311
case .single(let other):
364312
self = .pair(other, second)
365-
break
366313
case .pair(let otherFirst, let otherSecond):
367314
self = .array([otherFirst, otherSecond, second])
368-
break
369315
case .array(let other):
370316
self = .array(other + [second])
371-
break
372317
}
373-
break
374318
case (0, 2):
375319
self = newValue
376-
break
377320
case (1, 2):
378321
switch newValue {
379322
case .empty:
380323
self = .single(first)
381-
break
382324
case .single(let other):
383325
self = .pair(first, other)
384-
break
385326
case .pair(let otherFirst, let otherSecond):
386327
self = .array([first, otherFirst, otherSecond])
387-
break
388328
case .array(let other):
389329
self = .array([first] + other)
390330
}
391-
break
392331
case (2, 2):
393332
switch newValue {
394333
case .empty:
395334
break
396335
case .single(let other):
397336
self = .array([first, second, other])
398-
break
399337
case .pair(let otherFirst, let otherSecond):
400338
self = .array([first, second, otherFirst, otherSecond])
401-
break
402339
case .array(let other):
403340
self = .array([first, second] + other)
404341
}
405-
break
406342
default:
407343
fatalError("Range \(range) is out of bounds of count 2")
408344
}
@@ -414,17 +350,13 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
414350
break
415351
case .single(let index):
416352
newIndexes.insert(index, at: range.lowerBound)
417-
break
418353
case .pair(let first, let second):
419354
newIndexes.insert(first, at: range.lowerBound)
420355
newIndexes.insert(second, at: range.lowerBound + 1)
421-
break
422356
case .array(let other):
423357
newIndexes.insert(contentsOf: other, at: range.lowerBound)
424-
break
425358
}
426359
self = Storage(newIndexes)
427-
break
428360
}
429361
}
430362
}

‎test/stdlib/TestJSONEncoder.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,8 +1259,6 @@ func expectEqualPaths(_ lhs: [CodingKey], _ rhs: [CodingKey], _ prefix: String)
12591259
expectUnreachable("\(prefix) CodingKey.intValue mismatch: \(type(of: key1))(\(i1)) != \(type(of: key2))(\(i2))")
12601260
return
12611261
}
1262-
1263-
break
12641262
}
12651263

12661264
expectEqual(key1.stringValue, key2.stringValue, "\(prefix) CodingKey.stringValue mismatch: \(type(of: key1))('\(key1.stringValue)') != \(type(of: key2))('\(key2.stringValue)')")

0 commit comments

Comments
 (0)