Skip to content

Commit 12b1db1

Browse files
committed
More @unsafe cleanups for pointers and spans
1 parent a2694fd commit 12b1db1

File tree

4 files changed

+77
-55
lines changed

4 files changed

+77
-55
lines changed

stdlib/public/core/Span/RawSpan.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ extension RawSpan {
117117
public init(
118118
_unsafeBytes buffer: borrowing Slice<UnsafeRawBufferPointer>
119119
) {
120-
let rawBuffer = UnsafeRawBufferPointer(rebasing: buffer)
120+
let rawBuffer = unsafe UnsafeRawBufferPointer(rebasing: buffer)
121121
let span = RawSpan(_unsafeBytes: rawBuffer)
122122
// As a trivial value, 'rawBuffer' does not formally depend on the
123123
// lifetime of 'buffer'. Make the dependence explicit.
@@ -150,7 +150,7 @@ extension RawSpan {
150150
_unsafeBytes buffer: borrowing Slice<UnsafeMutableRawBufferPointer>
151151
) {
152152
let rawBuffer =
153-
UnsafeRawBufferPointer(UnsafeMutableRawBufferPointer(rebasing: buffer))
153+
UnsafeRawBufferPointer(unsafe UnsafeMutableRawBufferPointer(rebasing: buffer))
154154
let span = RawSpan(_unsafeBytes: rawBuffer)
155155
// As a trivial value, 'rawBuffer' does not formally depend on the
156156
// lifetime of 'buffer'. Make the dependence explicit.

stdlib/public/core/Span/Span.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ extension Span where Element: BitwiseCopyable {
308308
public init(
309309
_unsafeBytes buffer: borrowing Slice<UnsafeRawBufferPointer>
310310
) {
311-
let rawBuffer = UnsafeRawBufferPointer(rebasing: buffer)
311+
let rawBuffer = unsafe UnsafeRawBufferPointer(rebasing: buffer)
312312
let span = Span(_unsafeBytes: rawBuffer)
313313
// As a trivial value, 'rawBuffer' does not formally depend on the
314314
// lifetime of 'buffer'. Make the dependence explicit.
@@ -332,7 +332,7 @@ extension Span where Element: BitwiseCopyable {
332332
public init(
333333
_unsafeBytes buffer: borrowing Slice<UnsafeMutableRawBufferPointer>
334334
) {
335-
let rawBuffer = UnsafeRawBufferPointer(rebasing: buffer)
335+
let rawBuffer = unsafe UnsafeRawBufferPointer(rebasing: buffer)
336336
let span = Span(_unsafeBytes: rawBuffer)
337337
// As a trivial value, 'rawBuffer' does not formally depend on the
338338
// lifetime of 'buffer'. Make the dependence explicit.

stdlib/public/core/UnsafeBufferPointerSlice.swift

+19-19
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
2929
public func copyBytes<C: Collection>(
3030
from source: C
3131
) where C.Element == UInt8 {
32-
let buffer = Base(rebasing: self)
32+
let buffer = unsafe Base(rebasing: self)
3333
unsafe buffer.copyBytes(from: source)
3434
}
3535

@@ -62,7 +62,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
6262
public func initializeMemory<T>(
6363
as type: T.Type, repeating repeatedValue: T
6464
) -> UnsafeMutableBufferPointer<T> {
65-
let buffer = Base(rebasing: self)
65+
let buffer = unsafe Base(rebasing: self)
6666
return unsafe buffer.initializeMemory(as: T.self, repeating: repeatedValue)
6767
}
6868

@@ -94,7 +94,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
9494
public func initializeMemory<S: Sequence>(
9595
as type: S.Element.Type, from source: S
9696
) -> (unwritten: S.Iterator, initialized: UnsafeMutableBufferPointer<S.Element>) {
97-
let buffer = Base(rebasing: self)
97+
let buffer = unsafe Base(rebasing: self)
9898
return unsafe buffer.initializeMemory(as: S.Element.self, from: source)
9999
}
100100

@@ -127,7 +127,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
127127
as type: C.Element.Type,
128128
fromContentsOf source: C
129129
) -> UnsafeMutableBufferPointer<C.Element> {
130-
let buffer = Base(rebasing: self)
130+
let buffer = unsafe Base(rebasing: self)
131131
return unsafe buffer.initializeMemory(as: C.Element.self, fromContentsOf: source)
132132
}
133133

@@ -165,7 +165,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
165165
as type: T.Type,
166166
fromContentsOf source: UnsafeMutableBufferPointer<T>
167167
) -> UnsafeMutableBufferPointer<T> {
168-
let buffer = Base(rebasing: self)
168+
let buffer = unsafe Base(rebasing: self)
169169
return unsafe buffer.moveInitializeMemory(as: T.self, fromContentsOf: source)
170170
}
171171

@@ -203,7 +203,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
203203
as type: T.Type,
204204
fromContentsOf source: Slice<UnsafeMutableBufferPointer<T>>
205205
) -> UnsafeMutableBufferPointer<T> {
206-
let buffer = Base(rebasing: self)
206+
let buffer = unsafe Base(rebasing: self)
207207
return unsafe buffer.moveInitializeMemory(as: T.self, fromContentsOf: source)
208208
}
209209

@@ -229,7 +229,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
229229
@inlinable
230230
@_alwaysEmitIntoClient
231231
public func bindMemory<T>(to type: T.Type) -> UnsafeMutableBufferPointer<T> {
232-
let buffer = Base(rebasing: self)
232+
let buffer = unsafe Base(rebasing: self)
233233
return unsafe buffer.bindMemory(to: T.self)
234234
}
235235

@@ -282,7 +282,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
282282
public func withMemoryRebound<T, Result, E: Error>(
283283
to type: T.Type, _ body: (UnsafeMutableBufferPointer<T>) throws(E) -> Result
284284
) throws(E) -> Result {
285-
let buffer = Base(rebasing: self)
285+
let buffer = unsafe Base(rebasing: self)
286286
return try unsafe buffer.withMemoryRebound(to: T.self, body)
287287
}
288288

@@ -307,7 +307,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
307307
public func assumingMemoryBound<T>(
308308
to type: T.Type
309309
) -> UnsafeMutableBufferPointer<T> {
310-
let buffer = Base(rebasing: self)
310+
let buffer = unsafe Base(rebasing: self)
311311
return unsafe buffer.assumingMemoryBound(to: T.self)
312312
}
313313

@@ -343,7 +343,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
343343
@inlinable
344344
@_alwaysEmitIntoClient
345345
public func load<T>(fromByteOffset offset: Int = 0, as type: T.Type) -> T {
346-
let buffer = Base(rebasing: self)
346+
let buffer = unsafe Base(rebasing: self)
347347
return unsafe buffer.load(fromByteOffset: offset, as: T.self)
348348
}
349349

@@ -384,7 +384,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
384384
fromByteOffset offset: Int = 0,
385385
as type: T.Type
386386
) -> T {
387-
let buffer = Base(rebasing: self)
387+
let buffer = unsafe Base(rebasing: self)
388388
return unsafe buffer.loadUnaligned(fromByteOffset: offset, as: T.self)
389389
}
390390
@inlinable
@@ -393,7 +393,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
393393
fromByteOffset offset: Int = 0,
394394
as type: T.Type
395395
) -> T {
396-
let buffer = Base(rebasing: self)
396+
let buffer = unsafe Base(rebasing: self)
397397
return unsafe buffer.loadUnaligned(fromByteOffset: offset, as: T.self)
398398
}
399399

@@ -437,7 +437,7 @@ extension Slice where Base == UnsafeMutableRawBufferPointer {
437437
public func storeBytes<T>(
438438
of value: T, toByteOffset offset: Int = 0, as type: T.Type
439439
) {
440-
let buffer = Base(rebasing: self)
440+
let buffer = unsafe Base(rebasing: self)
441441
unsafe buffer.storeBytes(of: value, toByteOffset: offset, as: T.self)
442442
}
443443
}
@@ -466,7 +466,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
466466
@inlinable
467467
@_alwaysEmitIntoClient
468468
public func bindMemory<T>(to type: T.Type) -> UnsafeBufferPointer<T> {
469-
let buffer = Base(rebasing: self)
469+
let buffer = unsafe Base(rebasing: self)
470470
return unsafe buffer.bindMemory(to: T.self)
471471
}
472472

@@ -519,7 +519,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
519519
public func withMemoryRebound<T, Result, E: Error>(
520520
to type: T.Type, _ body: (UnsafeBufferPointer<T>) throws(E) -> Result
521521
) throws(E) -> Result {
522-
let buffer = Base(rebasing: self)
522+
let buffer = unsafe Base(rebasing: self)
523523
return try unsafe buffer.withMemoryRebound(to: T.self, body)
524524
}
525525

@@ -544,7 +544,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
544544
public func assumingMemoryBound<T>(
545545
to type: T.Type
546546
) -> UnsafeBufferPointer<T> {
547-
let buffer = Base(rebasing: self)
547+
let buffer = unsafe Base(rebasing: self)
548548
return unsafe buffer.assumingMemoryBound(to: T.self)
549549
}
550550

@@ -580,7 +580,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
580580
@inlinable
581581
@_alwaysEmitIntoClient
582582
public func load<T>(fromByteOffset offset: Int = 0, as type: T.Type) -> T {
583-
let buffer = Base(rebasing: self)
583+
let buffer = unsafe Base(rebasing: self)
584584
return unsafe buffer.load(fromByteOffset: offset, as: T.self)
585585
}
586586

@@ -621,7 +621,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
621621
fromByteOffset offset: Int = 0,
622622
as type: T.Type
623623
) -> T {
624-
let buffer = Base(rebasing: self)
624+
let buffer = unsafe Base(rebasing: self)
625625
return unsafe buffer.loadUnaligned(fromByteOffset: offset, as: T.self)
626626
}
627627
@inlinable
@@ -630,7 +630,7 @@ extension Slice where Base == UnsafeRawBufferPointer {
630630
fromByteOffset offset: Int = 0,
631631
as type: T.Type
632632
) -> T {
633-
let buffer = Base(rebasing: self)
633+
let buffer = unsafe Base(rebasing: self)
634634
return unsafe buffer.loadUnaligned(fromByteOffset: offset, as: T.self)
635635
}
636636
}

0 commit comments

Comments
 (0)