Skip to content

Basics,_AsyncFileSystem: internalise SystemPackage #8231

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

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Basics,_AsyncFileSystem: internalise SystemPackage #8231

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
1 change: 0 additions & 1 deletion Sources/Basics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ target_link_libraries(Basics PUBLIC
_AsyncFileSystem
SwiftCollections::DequeModule
SwiftCollections::OrderedCollections
SwiftSystem::SystemPackage
TSCBasic
TSCUtility)
target_link_libraries(Basics PRIVATE
Expand Down
1 change: 0 additions & 1 deletion Sources/Basics/FileSystem/FileSystem+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import struct Foundation.Data
import class Foundation.FileManager
import struct Foundation.UUID
import SystemPackage

import struct TSCBasic.ByteString
import struct TSCBasic.FileInfo
Expand Down
2 changes: 1 addition & 1 deletion Sources/QueryEngine/CacheKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@_exported import protocol Crypto.HashFunction
import struct Foundation.URL
import struct SystemPackage.FilePath
package import struct SystemPackage.FilePath

/// Indicates that values of a conforming type can be hashed with an arbitrary hashing function. Unlike `Hashable`,
/// this protocol doesn't utilize random seed values and produces consistent hash values across process launches.
Expand Down
2 changes: 1 addition & 1 deletion Sources/QueryEngine/FileCacheRecord.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import struct _AsyncFileSystem.OpenReadableFile

// FIXME: need a new swift-system tag to remove `@preconcurrency`
@preconcurrency import struct SystemPackage.FilePath
@preconcurrency package import struct SystemPackage.FilePath

package struct FileCacheRecord: Sendable {
package let path: FilePath
Expand Down
2 changes: 1 addition & 1 deletion Sources/QueryEngine/Query.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

import struct SystemPackage.FilePath
package import struct SystemPackage.FilePath

package protocol Query: Sendable {
associatedtype Key: CacheKey
Expand Down
2 changes: 1 addition & 1 deletion Sources/QueryEngine/QueryEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import _AsyncFileSystem
import Basics
import Crypto
@preconcurrency import SystemPackage
@preconcurrency package import SystemPackage

package func withQueryEngine(
_ fileSystem: some AsyncFileSystem,
Expand Down
2 changes: 1 addition & 1 deletion Sources/_AsyncFileSystem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ add_library(_AsyncFileSystem
ReadableFileStream.swift
WritableStream.swift
)
target_link_libraries(_AsyncFileSystem PUBLIC
target_link_libraries(_AsyncFileSystem PRIVATE
SwiftSystem::SystemPackage)

# NOTE(compnerd) workaround for CMake not setting up include flags yet
Expand Down
2 changes: 1 addition & 1 deletion Sources/_AsyncFileSystem/ReadableFileStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

package import _Concurrency
internal import SystemPackage
package import SystemPackage
internal import class Dispatch.DispatchQueue

/// Type-erasure wrapper over underlying file system readable streams.
Expand Down