Skip to content

Commit 337b20e

Browse files
Remove some redundant unsafe markings (#83192)
We were getting warnings about these; remove them to cut down on noise.
1 parent 04726c0 commit 337b20e

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

stdlib/public/core/DictionaryBridging.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ final internal class _SwiftDeferredNSDictionary<Key: Hashable, Value>
415415

416416
unsafe unmanagedObjects[i] = unsafe _key(at: bucket, bridgedKeys: bridgedKeys)
417417
stored += 1
418-
unsafe bucket = unsafe hashTable.occupiedBucket(after: bucket)
418+
bucket = unsafe hashTable.occupiedBucket(after: bucket)
419419
}
420420
unsafe theState.extra.0 = CUnsignedLong(bucket.offset)
421421
unsafe state.pointee = theState

stdlib/public/core/DictionaryBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ extension _NativeDictionary {
160160
target = b
161161
} else {
162162
let hashValue = unsafe self.hashValue(for: _keys[bucket.offset])
163-
unsafe target = unsafe hashTable.insertNew(hashValue: hashValue)
163+
target = unsafe hashTable.insertNew(hashValue: hashValue)
164164
}
165165

166166
if target > bucket {

stdlib/public/core/DictionaryStorage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ extension __RawDictionaryStorage {
249249
if unsafe uncheckedKey(at: bucket) == key {
250250
return (bucket, true)
251251
}
252-
unsafe bucket = unsafe hashTable.bucket(wrappedAfter: bucket)
252+
bucket = unsafe hashTable.bucket(wrappedAfter: bucket)
253253
}
254254
return (bucket, false)
255255
}
@@ -364,7 +364,7 @@ final internal class _DictionaryStorage<Key: Hashable, Value>
364364
unsafe unmanagedObjects[i] = _bridgeAnythingToObjectiveC(key)
365365

366366
stored += 1
367-
unsafe bucket = unsafe hashTable.occupiedBucket(after: bucket)
367+
bucket = unsafe hashTable.occupiedBucket(after: bucket)
368368
}
369369
unsafe theState.extra.0 = CUnsignedLong(bucket.offset)
370370
unsafe state.pointee = theState

stdlib/public/core/HashTable.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ extension _HashTable {
148148
@inlinable
149149
@inline(__always)
150150
internal init(word: Int, bit: Int) {
151-
unsafe self.offset = unsafe _UnsafeBitset.join(word: word, bit: bit)
151+
self.offset = unsafe _UnsafeBitset.join(word: word, bit: bit)
152152
}
153153

154154
@inlinable
@@ -501,7 +501,7 @@ extension _HashTable {
501501
delegate.moveEntry(from: candidate, to: hole)
502502
hole = candidate
503503
}
504-
unsafe candidate = unsafe self.bucket(wrappedAfter: candidate)
504+
candidate = unsafe self.bucket(wrappedAfter: candidate)
505505
}
506506

507507
unsafe words[hole.word].uncheckedRemove(hole.bit)

stdlib/public/core/KeyPath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3308,7 +3308,7 @@ internal func _walkKeyPathPattern<W: KeyPathPatternVisitor>(
33083308
unsafe _resolveRelativeIndirectableAddress(descriptorBase, descriptorOffset)
33093309
let descriptorHeader: RawKeyPathComponent.Header
33103310
if unsafe descriptor != UnsafeRawPointer(bitPattern: 0) {
3311-
unsafe descriptorHeader = unsafe descriptor.load(as: RawKeyPathComponent.Header.self)
3311+
descriptorHeader = unsafe descriptor.load(as: RawKeyPathComponent.Header.self)
33123312
if descriptorHeader.isTrivialPropertyDescriptor {
33133313
// If the descriptor is trivial, then use the local candidate.
33143314
// Skip the external generic parameter accessors to get to it.

stdlib/public/core/NativeSet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ extension _NativeSet { // Low-level lookup operations
177177
if unsafe uncheckedElement(at: bucket) == element {
178178
return (bucket, true)
179179
}
180-
unsafe bucket = unsafe hashTable.bucket(wrappedAfter: bucket)
180+
bucket = unsafe hashTable.bucket(wrappedAfter: bucket)
181181
}
182182
return (bucket, false)
183183
}

stdlib/public/core/SetBridging.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ final internal class _SwiftDeferredNSSet<Element: Hashable>
279279
if bucket == endBucket { break }
280280
unsafe unmanagedObjects[i] = unsafe bridgedElements[bucket]
281281
stored += 1
282-
unsafe bucket = unsafe hashTable.occupiedBucket(after: bucket)
282+
bucket = unsafe hashTable.occupiedBucket(after: bucket)
283283
}
284284
unsafe theState.extra.0 = CUnsignedLong(bucket.offset)
285285
unsafe state.pointee = theState

stdlib/public/core/SetStorage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ final internal class _SetStorage<Element: Hashable>
293293
let element = unsafe _elements[bucket.offset]
294294
unsafe unmanagedObjects[i] = _bridgeAnythingToObjectiveC(element)
295295
stored += 1
296-
unsafe bucket = unsafe hashTable.occupiedBucket(after: bucket)
296+
bucket = unsafe hashTable.occupiedBucket(after: bucket)
297297
}
298298
unsafe theState.extra.0 = CUnsignedLong(bucket.offset)
299299
unsafe state.pointee = theState

0 commit comments

Comments
 (0)