Skip to content

Prefer FoundationEssentials over Foundation for the Data bridges #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lhoward wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −5
Open

Prefer FoundationEssentials over Foundation for the Data bridges #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Sources/BinaryParsing/Parser Types/ParserSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#if !$Embedded && canImport(Foundation)
#if !$Embedded && canImport(FoundationEssentials)
public import FoundationEssentials
#elseif !$Embedded && canImport(Foundation)
public import Foundation
#endif

Expand Down Expand Up @@ -65,8 +67,8 @@ extension RandomAccessCollection<UInt8> {
public func withParserSpanIfAvailable<T>(
_ body: (inout ParserSpan) throws(ThrownParsingError) -> T
) throws(ThrownParsingError) -> T? {
#if !$Embedded && canImport(Foundation)
if let data = self as? Foundation.Data {
#if !$Embedded && (canImport(FoundationEssentials) || canImport(Foundation))
if let data = self as? Data {
let result = unsafe data.withUnsafeBytes { buffer in
var span = unsafe ParserSpan(_unsafeBytes: buffer)
return Result<T, ThrownParsingError> { try body(&span) }
Expand Down Expand Up @@ -138,7 +140,7 @@ extension ParserSpanProvider {
}
}

#if !$Embedded && canImport(Foundation)
#if !$Embedded && (canImport(FoundationEssentials) || canImport(Foundation))
extension Data: ParserSpanProvider {
@inlinable
public func withParserSpan<T, E>(
Expand Down
6 changes: 5 additions & 1 deletion Sources/BinaryParsing/Parsers/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
//
//===----------------------------------------------------------------------===//

#if !$Embedded && canImport(Foundation)
#if !$Embedded && canImport(FoundationEssentials)
public import FoundationEssentials
#elseif !$Embedded && canImport(Foundation)
public import Foundation
#endif

#if !$Embedded && (canImport(FoundationEssentials) || canImport(Foundation))
extension Data {
/// Creates a new data instance by copying the remaining bytes from the
/// given parser span.
Expand Down