Skip to content

Commit 791dd4c

Browse files
committed
[stdlib] name your constants better
- computed properties have an ABI impact; a function is fine here
1 parent 4a13c91 commit 791dd4c

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

stdlib/public/core/SmallString.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ extension _SmallString {
9494
}
9595

9696
@_alwaysEmitIntoClient @inline(__always)
97-
internal static var contiguousCapacity: Int {
97+
internal static func contiguousCapacity() -> Int {
9898
#if _pointerBitWidth(_32) && os(watchOS)
9999
return capacity &- 2
100100
#else

stdlib/public/core/StringUTF8View.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ extension String.UTF8View {
409409
public var _span: Span<UTF8.CodeUnit>? {
410410
@lifetime(borrow self)
411411
borrowing get {
412-
if _guts.isSmall, _guts.count > _SmallString.contiguousCapacity {
412+
if _guts.isSmall, _guts.count > _SmallString.contiguousCapacity() {
413413
return nil
414414
}
415415
return _underlyingSpan()

stdlib/public/core/Substring.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,8 @@ extension Substring.UTF8View {
871871
public var _span: Span<UTF8.CodeUnit>? {
872872
@lifetime(borrow self)
873873
borrowing get {
874-
if _wholeGuts.isSmall, _wholeGuts.count > _SmallString.contiguousCapacity {
874+
if _wholeGuts.isSmall,
875+
_wholeGuts.count > _SmallString.contiguousCapacity() {
875876
// substring is spannable only when the whole string is spannable.
876877
return nil
877878
}

stdlib/public/core/UTF8Span.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ extension String {
291291
public var _utf8Span: UTF8Span? {
292292
@lifetime(borrow self)
293293
borrowing get {
294-
if _guts.isSmall, _guts.count > _SmallString.contiguousCapacity {
294+
if _guts.isSmall, _guts.count > _SmallString.contiguousCapacity() {
295295
return nil
296296
}
297297
return unsafe UTF8Span(
@@ -426,7 +426,8 @@ extension Substring {
426426
public var _utf8Span: UTF8Span? {
427427
@lifetime(borrow self)
428428
borrowing get {
429-
if _wholeGuts.isSmall, _wholeGuts.count > _SmallString.contiguousCapacity {
429+
if _wholeGuts.isSmall,
430+
_wholeGuts.count > _SmallString.contiguousCapacity() {
430431
// substring is spannable only when the whole string is spannable.
431432
return nil
432433
}

0 commit comments

Comments
 (0)