Skip to content

Commit 7e9c8c2

Browse files
ikesyoikesyo
committed
[gardening] Remove unnecessary breaks
1 parent b49545f commit 7e9c8c2

File tree

4 files changed

+0
-84
lines changed

4 files changed

+0
-84
lines changed

‎Foundation/Data.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,7 +1613,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16131613
precondition(range.lowerBound <= endIndex, "index \(range.lowerBound) is out of bounds of \(startIndex)..<\(endIndex)")
16141614
self = .large(LargeSlice(count: range.upperBound))
16151615
}
1616-
break
16171616
case .inline(var inline):
16181617
if inline.count < range.upperBound {
16191618
if InlineSlice.canStore(count: range.upperBound) {
@@ -1629,7 +1628,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16291628
inline.resetBytes(in: range)
16301629
self = .inline(inline)
16311630
}
1632-
break
16331631
case .slice(var slice):
16341632
if InlineSlice.canStore(count: range.upperBound) {
16351633
self = .empty
@@ -1641,7 +1639,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16411639
newSlice.resetBytes(in: range)
16421640
self = .large(newSlice)
16431641
}
1644-
break
16451642
case .large(var slice):
16461643
self = .empty
16471644
slice.resetBytes(in: range)
@@ -1663,7 +1660,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16631660
} else {
16641661
self = .large(LargeSlice(UnsafeRawBufferPointer(start: bytes, count: cnt)))
16651662
}
1666-
break
16671663
case .inline(var inline):
16681664
let resultingCount = inline.count + cnt - (subrange.upperBound - subrange.lowerBound)
16691665
if resultingCount == 0 {
@@ -1680,7 +1676,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
16801676
slice.replaceSubrange(subrange, with: bytes, count: cnt)
16811677
self = .large(slice)
16821678
}
1683-
break
16841679
case .slice(var slice):
16851680
let resultingUpper = slice.endIndex + cnt - (subrange.upperBound - subrange.lowerBound)
16861681
if slice.startIndex == 0 && resultingUpper == 0 {
@@ -1853,7 +1848,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
18531848
return
18541849
case .inline(let inline):
18551850
inline.copyBytes(to: pointer, from: range)
1856-
break
18571851
case .slice(let slice):
18581852
slice.copyBytes(to: pointer, from: range)
18591853
case .large(let slice):

‎Foundation/IndexPath.swift

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,12 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
5252
switch elements.count {
5353
case 0:
5454
self = .empty
55-
break
5655
case 1:
5756
self = .single(elements[0])
58-
break
5957
case 2:
6058
self = .pair(elements[0], elements[1])
61-
break
6259
default:
6360
self = .array(elements)
64-
break
6561
}
6662
}
6763

@@ -87,16 +83,12 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
8783
switch self {
8884
case .empty:
8985
self = .single(other)
90-
break
9186
case .single(let first):
9287
self = .pair(first, other)
93-
break
9488
case .pair(let first, let second):
9589
self = .array([first, second, other])
96-
break
9790
case .array(let indexes):
9891
self = .array(indexes + [other])
99-
break
10092
}
10193
}
10294

@@ -109,63 +101,47 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
109101
break
110102
case .single(let rhsIndex):
111103
self = .single(rhsIndex)
112-
break
113104
case .pair(let rhsFirst, let rhsSecond):
114105
self = .pair(rhsFirst, rhsSecond)
115-
break
116106
case .array(let rhsIndexes):
117107
self = .array(rhsIndexes)
118-
break
119108
}
120-
break
121109
case .single(let lhsIndex):
122110
switch other {
123111
case .empty:
124112
// DO NOTHING
125113
break
126114
case .single(let rhsIndex):
127115
self = .pair(lhsIndex, rhsIndex)
128-
break
129116
case .pair(let rhsFirst, let rhsSecond):
130117
self = .array([lhsIndex, rhsFirst, rhsSecond])
131-
break
132118
case .array(let rhsIndexes):
133119
self = .array([lhsIndex] + rhsIndexes)
134-
break
135120
}
136-
break
137121
case .pair(let lhsFirst, let lhsSecond):
138122
switch other {
139123
case .empty:
140124
// DO NOTHING
141125
break
142126
case .single(let rhsIndex):
143127
self = .array([lhsFirst, lhsSecond, rhsIndex])
144-
break
145128
case .pair(let rhsFirst, let rhsSecond):
146129
self = .array([lhsFirst, lhsSecond, rhsFirst, rhsSecond])
147-
break
148130
case .array(let rhsIndexes):
149131
self = .array([lhsFirst, lhsSecond] + rhsIndexes)
150-
break
151132
}
152-
break
153133
case .array(let lhsIndexes):
154134
switch other {
155135
case .empty:
156136
// DO NOTHING
157137
break
158138
case .single(let rhsIndex):
159139
self = .array(lhsIndexes + [rhsIndex])
160-
break
161140
case .pair(let rhsFirst, let rhsSecond):
162141
self = .array(lhsIndexes + [rhsFirst, rhsSecond])
163-
break
164142
case .array(let rhsIndexes):
165143
self = .array(lhsIndexes + rhsIndexes)
166-
break
167144
}
168-
break
169145
}
170146
}
171147

@@ -178,41 +154,31 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
178154
break
179155
case 1:
180156
self = .single(other[0])
181-
break
182157
case 2:
183158
self = .pair(other[0], other[1])
184-
break
185159
default:
186160
self = .array(other)
187-
break
188161
}
189-
break
190162
case .single(let first):
191163
switch other.count {
192164
case 0:
193165
// DO NOTHING
194166
break
195167
case 1:
196168
self = .pair(first, other[0])
197-
break
198169
default:
199170
self = .array([first] + other)
200-
break
201171
}
202-
break
203172
case .pair(let first, let second):
204173
switch other.count {
205174
case 0:
206175
// DO NOTHING
207176
break
208177
default:
209178
self = .array([first, second] + other)
210-
break
211179
}
212-
break
213180
case .array(let indexes):
214181
self = .array(indexes + other)
215-
break
216182
}
217183
}
218184

@@ -221,7 +187,6 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
221187
switch self {
222188
case .empty:
223189
fatalError("index \(index) out of bounds of count 0")
224-
break
225190
case .single(let first):
226191
precondition(index == 0, "index \(index) out of bounds of count 1")
227192
return first
@@ -236,24 +201,20 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
236201
switch self {
237202
case .empty:
238203
fatalError("index \(index) out of bounds of count 0")
239-
break
240204
case .single:
241205
precondition(index == 0, "index \(index) out of bounds of count 1")
242206
self = .single(newValue)
243-
break
244207
case .pair(let first, let second):
245208
precondition(index >= 0 && index < 2, "index \(index) out of bounds of count 2")
246209
if index == 0 {
247210
self = .pair(newValue, second)
248211
} else {
249212
self = .pair(first, newValue)
250213
}
251-
break
252214
case .array(let indexes_):
253215
var indexes = indexes_
254216
indexes[index] = newValue
255217
self = .array(indexes)
256-
break
257218
}
258219
}
259220
}
@@ -278,9 +239,7 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
278239
default:
279240
fatalError("range \(range) is out of bounds of count 1")
280241
}
281-
return self
282242
case .pair(let first, let second):
283-
284243
switch (range.lowerBound, range.upperBound) {
285244
case (0, 0):
286245
fallthrough
@@ -316,7 +275,6 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
316275
case .empty:
317276
precondition(range.lowerBound == 0 && range.upperBound == 0, "range \(range) is out of bounds of count 0")
318277
self = newValue
319-
break
320278
case .single(let index):
321279
switch (range.lowerBound, range.upperBound, newValue) {
322280
case (0, 0, .empty):
@@ -325,13 +283,10 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
325283
break
326284
case (0, 0, .single(let other)):
327285
self = .pair(other, index)
328-
break
329286
case (0, 0, .pair(let first, let second)):
330287
self = .array([first, second, index])
331-
break
332288
case (0, 0, .array(let other)):
333289
self = .array(other + [index])
334-
break
335290
case (0, 1, .empty):
336291
fallthrough
337292
case (0, 1, .single):
@@ -342,13 +297,10 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
342297
self = newValue
343298
case (1, 1, .single(let other)):
344299
self = .pair(index, other)
345-
break
346300
case (1, 1, .pair(let first, let second)):
347301
self = .array([index, first, second])
348-
break
349302
case (1, 1, .array(let other)):
350303
self = .array([index] + other)
351-
break
352304
default:
353305
fatalError("range \(range) is out of bounds of count 1")
354306
}
@@ -360,63 +312,46 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
360312
break
361313
case .single(let other):
362314
self = .array([other, first, second])
363-
break
364315
case .pair(let otherFirst, let otherSecond):
365316
self = .array([otherFirst, otherSecond, first, second])
366-
break
367317
case .array(let other):
368318
self = .array(other + [first, second])
369-
break
370319
}
371-
break
372320
case (0, 1):
373321
switch newValue {
374322
case .empty:
375323
self = .single(second)
376-
break
377324
case .single(let other):
378325
self = .pair(other, second)
379-
break
380326
case .pair(let otherFirst, let otherSecond):
381327
self = .array([otherFirst, otherSecond, second])
382-
break
383328
case .array(let other):
384329
self = .array(other + [second])
385-
break
386330
}
387-
break
388331
case (0, 2):
389332
self = newValue
390-
break
391333
case (1, 2):
392334
switch newValue {
393335
case .empty:
394336
self = .single(first)
395-
break
396337
case .single(let other):
397338
self = .pair(first, other)
398-
break
399339
case .pair(let otherFirst, let otherSecond):
400340
self = .array([first, otherFirst, otherSecond])
401-
break
402341
case .array(let other):
403342
self = .array([first] + other)
404343
}
405-
break
406344
case (2, 2):
407345
switch newValue {
408346
case .empty:
409347
break
410348
case .single(let other):
411349
self = .array([first, second, other])
412-
break
413350
case .pair(let otherFirst, let otherSecond):
414351
self = .array([first, second, otherFirst, otherSecond])
415-
break
416352
case .array(let other):
417353
self = .array([first, second] + other)
418354
}
419-
break
420355
default:
421356
fatalError("range \(range) is out of bounds of count 2")
422357
}
@@ -428,17 +363,13 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
428363
break
429364
case .single(let index):
430365
newIndexes.insert(index, at: range.lowerBound)
431-
break
432366
case .pair(let first, let second):
433367
newIndexes.insert(first, at: range.lowerBound)
434368
newIndexes.insert(second, at: range.lowerBound + 1)
435-
break
436369
case .array(let other):
437370
newIndexes.insert(contentsOf: other, at: range.lowerBound)
438-
break
439371
}
440372
self = Storage(newIndexes)
441-
break
442373
}
443374
}
444375
}

‎Foundation/NSNumber.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,27 +1065,21 @@ open class NSNumber : NSValue {
10651065
switch type {
10661066
case kCFNumberSInt8Type:
10671067
valuePtr.assumingMemoryBound(to: Int8.self).pointee = int8Value
1068-
break
10691068
case kCFNumberSInt16Type:
10701069
valuePtr.assumingMemoryBound(to: Int16.self).pointee = int16Value
1071-
break
10721070
case kCFNumberSInt32Type:
10731071
valuePtr.assumingMemoryBound(to: Int32.self).pointee = int32Value
1074-
break
10751072
case kCFNumberSInt64Type:
10761073
valuePtr.assumingMemoryBound(to: Int64.self).pointee = int64Value
1077-
break
10781074
case kCFNumberSInt128Type:
10791075
struct CFSInt128Struct {
10801076
var high: Int64
10811077
var low: UInt64
10821078
}
10831079
let val = int64Value
10841080
valuePtr.assumingMemoryBound(to: CFSInt128Struct.self).pointee = CFSInt128Struct.init(high: (val < 0) ? -1 : 0, low: UInt64(bitPattern: val))
1085-
break
10861081
case kCFNumberFloat32Type:
10871082
valuePtr.assumingMemoryBound(to: Float.self).pointee = floatValue
1088-
break
10891083
case kCFNumberFloat64Type:
10901084
valuePtr.assumingMemoryBound(to: Double.self).pointee = doubleValue
10911085
default: fatalError()
@@ -1106,7 +1100,6 @@ open class NSNumber : NSValue {
11061100
switch objCType.pointee {
11071101
case 0x42:
11081102
aCoder.encode(boolValue, forKey: "NS.boolval")
1109-
break
11101103
case 0x63: fallthrough
11111104
case 0x43: fallthrough
11121105
case 0x73: fallthrough

‎TestFoundation/TestJSONEncoder.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,6 @@ func expectEqualPaths(_ lhs: [CodingKey?], _ rhs: [CodingKey?], _ prefix: String
826826
XCTFail("\(prefix) CodingKey.intValue mismatch: \(type(of: key1))(\(i1)) != \(type(of: key2))(\(i2))")
827827
return
828828
}
829-
830-
break
831829
}
832830

833831
XCTAssertEqual(key1.stringValue,

0 commit comments

Comments
 (0)