Merge pull request #362 from davidungar/rm-spis

Remove @_spi's that were preventing compilation

Author: David Ungar

Sources/SwiftDriver/Driver/Driver.swift

@@ -195,7 +195,7 @@ public struct Driver {
   /// Info needed to write and maybe read the build record.
   /// Only present when the driver will be writing the record.
   /// Only used for reading when compiling incrementally.
-  @_spi(Testing) public let buildRecordInfo: BuildRecordInfo?
+  let buildRecordInfo: BuildRecordInfo?
 
   /// Code & data for incremental compilation. Nil if not running in incremental mode
   @_spi(Testing) public let incrementalCompilationState: IncrementalCompilationState?

Sources/SwiftDriver/Incremental Compilation/BuildRecord.swift

@@ -163,7 +163,7 @@ extension BuildRecord {
     )
   }
 
-  @_spi(Testing) public func encode() throws -> String {
+   func encode() throws -> String {
       let pathsAndInfos = try inputInfos.map {
         input, inputInfo -> (String, InputInfo) in
         guard let path = input.absolutePath else {

Sources/SwiftDriver/Incremental Compilation/BuildRecordInfo.swift

@@ -16,7 +16,7 @@ import SwiftOptions
 
 /// Holds information required to read and write the build record (aka compilation record)
 /// This info is always written, but only read for incremental compilation.
-@_spi(Testing) public class BuildRecordInfo {
+ class BuildRecordInfo {
   let buildRecordPath: VirtualPath
   let fileSystem: FileSystem
   let argsHash: String

Sources/SwiftDriver/Incremental Compilation/DependencyKey.swift

@@ -2,13 +2,13 @@
 import Foundation
 
 /// A filename from another module
-@_spi(Testing) public struct ExternalDependency: Hashable, CustomStringConvertible {
+struct ExternalDependency: Hashable, CustomStringConvertible {
   let fileName: String
 
   var file: VirtualPath? {
     try? VirtualPath(path: fileName)
   }
-  @_spi(Testing) public init(_ path: String) {
+  init(_ path: String) {
     self.fileName = path
   }
   public var description: String {
@@ -18,7 +18,7 @@ import Foundation
 
 
 
-@_spi(Testing) public struct DependencyKey: Hashable {
+public struct DependencyKey: Hashable {
   /// Instead of the status quo scheme of two kinds of "Depends", cascading and
   /// non-cascading this code represents each entity ("Provides" in the status
   /// quo), by a pair of nodes. One node represents the "implementation." If the
@@ -31,15 +31,15 @@ import Foundation
   /// implementations white. Each node holds an instance variable describing which
   /// aspect of the entity it represents.
 
-  @_spi(Testing) public enum DeclAspect {
+  enum DeclAspect {
     case interface, implementation
   }
 
   /// Encode the current sorts of dependencies as kinds of nodes in the dependency
   /// graph, splitting the current *member* into \ref member and \ref
   /// potentialMember and adding \ref sourceFileProvide.
   ///
-  @_spi(Testing) public enum Designator: Hashable {
+  enum Designator: Hashable {
     case
       topLevel(name: String),
       dynamicLookup(name: String),
@@ -60,13 +60,13 @@ import Foundation
       default:
         return nil}
     }
- }
+  }
 
-  @_spi(Testing) public let aspect: DeclAspect
-  @_spi(Testing) public let designator: Designator
+  let aspect: DeclAspect
+  let designator: Designator
 
 
-  @_spi(Testing) public init(
+  init(
     aspect: DeclAspect,
     designator: Designator)
   {
@@ -75,7 +75,7 @@ import Foundation
   }
 
 
-  @_spi(Testing) public var correspondingImplementation: Self {
+  var correspondingImplementation: Self {
     assert(aspect == .interface)
     return Self(aspect: .implementation, designator: designator)
   }

Sources/SwiftDriver/Incremental Compilation/DictionaryOfDictionaries.swift

@@ -14,7 +14,7 @@
 /// It supports iterating over all 2nd-level pairs. See `subscript(key: OuterKey)`
 
 import Foundation
-@_spi(Testing) public struct DictionaryOfDictionaries<OuterKey: Hashable, InnerKey: Hashable, Value>: Collection {
+struct DictionaryOfDictionaries<OuterKey: Hashable, InnerKey: Hashable, Value>: Collection {
   public typealias InnerDict = [InnerKey: Value]
   public typealias OuterDict = [OuterKey: InnerDict]
 

Sources/SwiftDriver/Incremental Compilation/IncrementalCompilationState.swift

@@ -49,7 +49,7 @@ public class IncrementalCompilationState {
 
 // MARK: - Creating IncrementalCompilationState if possible
   /// Return nil if not compiling incrementally
-  @_spi(Testing) public init?(
+  init?(
     buildRecordInfo: BuildRecordInfo?,
     compilerMode: CompilerMode,
     diagnosticEngine: DiagnosticsEngine,

Sources/SwiftDriver/Incremental Compilation/InputInfo.swift

@@ -14,8 +14,8 @@ import TSCBasic
 
 public struct InputInfo: Equatable {
 
-  @_spi(Testing) public let status: Status
-  @_spi(Testing) public let previousModTime: Date
+  let status: Status
+  let previousModTime: Date
 
   public init(status: Status, previousModTime: Date) {
     self.status = status

Sources/SwiftDriver/Incremental Compilation/ModuleDependencyGraph Parts/Integrator.swift

@@ -17,12 +17,12 @@ extension ModuleDependencyGraph {
   // MARK: Integrator - state & creation
 
   /// Integrates a \c SourceFileDependencyGraph into a \c ModuleDependencyGraph
-  @_spi(Testing) public struct Integrator {
+  struct Integrator {
 
     // Shorthands
-    @_spi(Testing) public typealias Graph = ModuleDependencyGraph
+    typealias Graph = ModuleDependencyGraph
 
-    @_spi(Testing) public  typealias Changes = Set<Node>
+    typealias Changes = Set<Node>
 
     let source: SourceFileDependencyGraph
     let swiftDeps: SwiftDeps
@@ -55,7 +55,7 @@ extension ModuleDependencyGraph.Integrator {
     case notSwiftDeps
   }
   /// returns nil for error
-  @_spi(Testing) public static func integrate(
+  static func integrate(
     swiftDeps: Graph.SwiftDeps,
     into destination: Graph,
     diagnosticEngine: DiagnosticsEngine
@@ -76,7 +76,7 @@ extension ModuleDependencyGraph.Integrator {
   /// Integrate a SourceFileDepGraph into the receiver.
   /// Integration happens when the driver needs to read SourceFileDepGraph.
   /// Returns changed nodes
-  @_spi(Testing) public static func integrate(
+  static func integrate(
     from g: SourceFileDependencyGraph,
     swiftDeps: Graph.SwiftDeps,
     into destination: Graph

Sources/SwiftDriver/Incremental Compilation/ModuleDependencyGraph Parts/Node.swift

@@ -24,9 +24,9 @@ extension ModuleDependencyGraph {
   ///
   /// Use a class, not a struct because otherwise it would be duplicated for each thing it uses
 
-  @_spi(Testing) public final class Node {
+  final class Node {
 
-    @_spi(Testing) public typealias Graph = ModuleDependencyGraph
+    typealias Graph = ModuleDependencyGraph
 
     /// Def->use arcs go by DependencyKey. There may be >1 node for a given key.
     let dependencyKey: DependencyKey

Sources/SwiftDriver/Incremental Compilation/ModuleDependencyGraph Parts/NodeFinder.swift

@@ -17,7 +17,7 @@ extension ModuleDependencyGraph {
   /// The core information for the ModuleDependencyGraph
   /// Isolate in a sub-structure in order to faciliate invariant maintainance
   struct NodeFinder {
-    @_spi(Testing) public typealias Graph = ModuleDependencyGraph
+    typealias Graph = ModuleDependencyGraph
 
     /// Maps swiftDeps files and DependencyKeys to Nodes
     fileprivate typealias NodeMap = TwoDMap<SwiftDeps?, DependencyKey, Node>