Merge pull request #1017 from rex4539/typos

Fix typos

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -425,7 +425,7 @@ public struct Driver {
   ///   at the beginning.
   /// - Parameter env: The environment variables to use. This is a hook for testing;
   ///   in production, you should use the default argument, which copies the current environment.
-  /// - Parameter diagnosticsEngine: The diagnotic engine used by the driver to emit errors
+  /// - Parameter diagnosticsEngine: The diagnostic engine used by the driver to emit errors
   ///   and warnings.
   /// - Parameter fileSystem: The filesystem used by the driver to find resources/SDKs,
   ///   expand response files, etc. By default this is the local filesystem.
@@ -1049,7 +1049,7 @@ extension Driver {
           content.removeFirst(1)
 
           if quoted, content.first == "\"" {
-            // Consequtive double quotes inside a quoted string imples one quote
+            // Consecutive double quotes inside a quoted string implies one quote
             token.append("\"")
             content.removeFirst(1)
           }
@@ -1196,7 +1196,7 @@ extension Driver {
     let execRelPath = args.removeFirst()
     var driverName = try VirtualPath(path: execRelPath).basenameWithoutExt
 
-    // Determine if the driver kind is being overriden.
+    // Determine if the driver kind is being overridden.
     let driverModeOption = "--driver-mode="
     if let firstArg = args.first, firstArg.hasPrefix(driverModeOption) {
       args.removeFirst()
@@ -2277,7 +2277,7 @@ extension Driver {
     // Retrieve and validate module aliases if passed in
     let moduleAliases = moduleAliasesFromInput(parsedOptions.arguments(for: [.moduleAlias]), with: moduleName, onError: diagnosticsEngine)
 
-    // If we're not emiting a module, we're done.
+    // If we're not emitting a module, we're done.
     if moduleOutputKind == nil {
       return ModuleOutputInfo(output: nil, name: moduleName, nameIsFallback: moduleNameIsFallback, aliases: moduleAliases)
     }
@@ -2983,7 +2983,7 @@ extension Driver {
     return try VirtualPath.intern(path: moduleName.appendingFileTypeExtension(type))
   }
 
-  /// Determine if the build system has created a Project/ directory for auxilary outputs.
+  /// Determine if the build system has created a Project/ directory for auxiliary outputs.
   static func computeProjectDirectoryPath(moduleOutputPath: VirtualPath.Handle?,
                                           fileSystem: FileSystem) -> VirtualPath.Handle? {
     let potentialProjectDirectory = moduleOutputPath

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -150,7 +150,7 @@ public struct OutputFileMap: Hashable, Codable {
     try fileSystem.writeFileContents(file, bytes: ByteString(contents))
   }
 
-  /// Human-readable texual representation
+  /// Human-readable textual representation
   var description: String {
     var result = ""
     func outputPairDescription(inputPath: VirtualPath.Handle, outputPair: (FileType, VirtualPath.Handle))

Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift

@@ -88,7 +88,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
   ///   ClangD: (10.10, 10.13)
   ///
   /// Due to this requirement, we generate jobs for main main module dependencies in two stages:
-  /// 1. Generate jobs for all Swift modules, accumulating, for each Clang dependency, the dependending Swift
+  /// 1. Generate jobs for all Swift modules, accumulating, for each Clang dependency, the depending Swift
   /// module's target version (PCM Args).
   /// 2. Generate jobs for all Clang modules, now that we have each module's set of PCM versions it must be
   /// built against.
@@ -278,7 +278,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
                                        type: .swiftModule))
       }
     }
-    // Clang module depenencies are specified on the command line eplicitly
+    // Clang module dependencies are specified on the command line explicitly
     for moduleArtifactInfo in clangDependencyArtifacts {
       let clangModulePath =
         TypedVirtualPath(file: moduleArtifactInfo.modulePath.path,
@@ -327,7 +327,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
             try targetEncodedClangModuleFilePath(for: dependencyInfo,
                                                  hashParts: getPCMHashParts(pcmArgs: pcmArgs,
                                                                             contextHash: dependencyClangModuleDetails.contextHash))
-          // Accumulate the requried information about this dependency
+          // Accumulate the required information about this dependency
           clangDependencyArtifacts.append(
             ClangModuleArtifactInfo(name: dependencyId.moduleName,
                                     modulePath: TextualVirtualPath(path: clangModulePath),
@@ -338,7 +338,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
           let isFramework = prebuiltModuleDetails.isFramework ?? false
           let swiftModulePath: TypedVirtualPath =
             .init(file: compiledModulePath.path, type: .swiftModule)
-          // Accumulate the requried information about this dependency
+          // Accumulate the required information about this dependency
           // TODO: add .swiftdoc and .swiftsourceinfo for this module.
           swiftDependencyArtifacts.append(
             SwiftModuleArtifactInfo(name: dependencyId.moduleName,
@@ -399,7 +399,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
       return results
     }
 
-    // We need this to enable explict modules in the driver-as-executable mode. For instance,
+    // We need this to enable explicit modules in the driver-as-executable mode. For instance,
     // we have two Swift targets A and B, where A depends on X.pcm which in turn depends on Y.pcm,
     // and B only depends on Y.pcm. In the driver-as-executable mode, the build system isn't aware
     // of the shared dependency of Y.pcm so it will be generated multiple times. If all these Y.pcm

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/CommonDependencyOperations.swift

@@ -19,7 +19,7 @@ import TSCBasic
   throws {
     for (externalModuleId, externalModuleDetails) in externalTargetModuleDetailsMap {
       let externalModulePath = externalModuleDetails.path
-      // Replace the occurence of a Swift module to-be-built from source-file
+      // Replace the occurrence of a Swift module to-be-built from source-file
       // to an info that describes a pre-built binary module.
       let swiftModuleId: ModuleDependencyId = .swift(externalModuleId.moduleName)
       guard let currentInfo = modules[swiftModuleId] else {
@@ -65,7 +65,7 @@ extension InterModuleDependencyGraph {
       topologicalIdList.reduce(into: [ModuleDependencyId : Set<ModuleDependencyId>]()) {
         $0[$1] = [$1]
       }
-    // Traverse the set of modules in reverse topological order, accimilating transitive closures
+    // Traverse the set of modules in reverse topological order, assimilating transitive closures
     for moduleId in topologicalIdList.reversed() {
       for dependencyId in try moduleInfo(of: moduleId).directDependencies! {
         transitiveClosureMap[moduleId]!.formUnion(transitiveClosureMap[dependencyId]!)

Sources/SwiftDriver/IncrementalCompilation/DependencyKey.swift

@@ -183,7 +183,7 @@ public struct DependencyKey {
     ///
     /// A "dynamic member lookup" is the Swift frontend's term for lookups that
     /// occur against instances of `AnyObject`. Because an `AnyObject` node
-    /// behaves like `id` in that it can recieve any kind of Objective-C
+    /// behaves like `id` in that it can receive any kind of Objective-C
     /// message, the compiler takes care to log these names separately.
     ///
     /// The `name` parameter is the human-readable base name of the Swift method

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState+Extensions.swift

@@ -44,7 +44,7 @@ extension IncrementalCompilationState {
     let buildRecordInfo: BuildRecordInfo
     /// Record about existence and time of the last compile.
     let maybeBuildRecord: BuildRecord?
-    /// A set of inputs invalidated by external chagnes.
+    /// A set of inputs invalidated by external changes.
     let inputsInvalidatedByExternals: TransitivelyInvalidatedSwiftSourceFileSet
     /// Compiler options related to incremental builds.
     let incrementalOptions: IncrementalCompilationState.Options
@@ -295,7 +295,7 @@ extension IncrementalCompilationState {
 
     // Emits a remark indicating incremental compilation has been disabled.
     //
-    // FIXME: This entrypoint exists for compatiblity with the legacy driver.
+    // FIXME: This entrypoint exists for compatibility with the legacy driver.
     // This message is not necessary, and we should migrate the tests.
     func reportIncrementalCompilationHasBeenDisabled(_ why: String) {
       report("Incremental compilation has been disabled, \(why)")

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState.swift

@@ -21,7 +21,7 @@ import SwiftOptions
 /// using it as an oracle to discover the jobs to execute as the incremental
 /// build progresses. After a job completes, call
 /// `protectedState.collectJobsDiscoveredToBeNeededAfterFinishing(job:)`
-/// to both update the incremental state and recieve an array of jobs that
+/// to both update the incremental state and receive an array of jobs that
 /// need to be executed in response.
 ///
 /// Jobs become "unstuck" as their inputs become available, or may be discovered

Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift

@@ -175,7 +175,7 @@ extension IncrementalCompilationState {
     func computeInitialStateForPlanning() throws -> InitialStateForPlanning? {
       guard sourceFiles.disappeared.isEmpty else {
         // Would have to cleanse nodes of disappeared inputs from graph
-        // and would have to schedule files dependening on defs from disappeared nodes
+        // and would have to schedule files depending on defs from disappeared nodes
         if let reporter = reporter {
           reporter.report(
             "Incremental compilation has been disabled, "

Sources/SwiftDriver/IncrementalCompilation/KeyAndFingerprintHolder.swift

@@ -28,11 +28,11 @@ public struct KeyAndFingerprintHolder:
   ///
   /// However, at present, the frontend does not record this information for
   /// every Decl; it only records it for the source-file-as-a-whole in the
-  /// interface hash. The inteface hash is a product of all the tokens that are
+  /// interface hash. The interface hash is a product of all the tokens that are
   /// not inside of function bodies. Thus, if there is no fingerprint, when the
   /// frontend creates an interface node,
   /// it adds a dependency to it from the implementation source file node (which
-  /// has the intefaceHash as its fingerprint).
+  /// has the interfaceHash as its fingerprint).
   let fingerprint: InternedString?
 
   init(_ key: DependencyKey, _ fingerprint: InternedString?) throws {

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -24,7 +24,7 @@ import struct TSCUtility.Version
 // MARK: - ModuleDependencyGraph
 
 /// Holds all the dependency relationships in this module, and declarations in other modules that
-/// are dependended-upon.
+/// are depended-upon.
 /*@_spi(Testing)*/ public final class ModuleDependencyGraph: InternedStringTableHolder {
 
   /// Supports finding nodes in two ways.
@@ -241,7 +241,7 @@ extension ModuleDependencyGraph {
   ///
   /// - Parameter input: The file that has just been compiled
   /// - Returns: The input files that must be compiled now that `input` has been compiled.
-  /// These may include inptus that do not need compilation because this build already compiled them.
+  /// These may include inputs that do not need compilation because this build already compiled them.
   /// In case of an error, such as a missing entry in the `OutputFileMap`, nil is returned.
   @_spi(Testing) public func collectInputsRequiringCompilation(
     byCompiling input: SwiftSourceFile
@@ -283,7 +283,7 @@ extension ModuleDependencyGraph {
   ///
   /// - Parameters:
   ///   - fingerprintedExternalDependency: the dependency to trace
-  ///   - why: why the dependecy must be traced
+  ///   - why: why the dependency must be traced
   /// - Returns: any nodes that directly use (depend upon) that external dependency.
   /// As an optimization, only return the nodes that have not been already traced, because the traced nodes
   /// will have already been used to schedule jobs to run.
@@ -397,7 +397,7 @@ extension ModuleDependencyGraph {
     }
   }
 
-  /// Find the nodes *directly* invaliadated by some external dependency
+  /// Find the nodes *directly* invalidated by some external dependency
   ///
   /// This function does not do the transitive closure; that is left to the callers.
   func findNodesInvalidated(
@@ -618,7 +618,7 @@ extension ModuleDependencyGraph {
   /// - WARNING: You *must* increment the minor version number when making any
   ///            changes to the underlying serialization format.
   ///
-  /// - Minor number 1: Don't serialize the `inputDepedencySourceMap`
+  /// - Minor number 1: Don't serialize the `inputDependencySourceMap`
   /// - Minor number 2: Use `.swift` files instead of `.swiftdeps` in ``DependencySource``
   /// - Minor number 3: Use interned strings, including for fingerprints and use empty dependency source file for no DependencySource
   @_spi(Testing) public static let serializedGraphVersion = Version(1, 3, 0)
@@ -800,7 +800,7 @@ extension ModuleDependencyGraph {
 
       /// Determine whether (deserialized) node was for a definition in a source file that is no longer part of the build.
       ///
-      /// If the priors were read from an invocation containing a subsuequently removed input,
+      /// If the priors were read from an invocation containing a subsequently removed input,
       /// the nodes defining decls from that input must be culled.
       ///
       /// - Parameter node: The (deserialized) node to test.