Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ and `carton` 0.15. All version combinations of `carton` and JavaScriptKit higher
other.

You still have to keep in mind that older versions of SwiftWasm may be incompatible with newer `carton`. You can follow
the compatibility matrix if you need to use older verions:
the compatibility matrix if you need to use older versions:

| `carton` version | SwiftWasm version | JavaScriptKit version | Tokamak version |
| ---------------- | ----------------- | --------------------- | --------------- |
Expand Down Expand Up @@ -172,7 +172,7 @@ Refer to [the pre-commit documentation page](https://pre-commit.com/) for more d
and installation instructions for other platforms.

SwiftFormat and SwiftLint also run on CI for every PR and thus a CI build can
fail with incosistent formatting or style. We require CI builds to pass for all
fail with inconsistent formatting or style. We require CI builds to pass for all
PRs before merging.

### Code of Conduct
Expand Down
2 changes: 1 addition & 1 deletion Sources/CartonDriver/CartonDriverCommand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func pluginSubcommand(subcommand: String, argv0: String, arguments: [String]) as
)

var env: [String: String] = ProcessInfo.processInfo.environment
if ToolchainSystem.isSnapshotVersion(swiftPath.verison),
if ToolchainSystem.isSnapshotVersion(swiftPath.version),
swiftPath.toolchain.extension == "xctoolchain"
{
env["DYLD_LIBRARY_PATH"] = swiftPath.toolchain.appending(
Expand Down
2 changes: 1 addition & 1 deletion Sources/CartonKit/Parsers/DiagnosticsParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Foundation

/// Parses and re-formats diagnostics output by the Swift compiler.
///
/// The compiler output often repeats iteself, and the diagnostics can sometimes be
/// The compiler output often repeats itself, and the diagnostics can sometimes be
/// difficult to read.
/// This reformats them to a more readable output.
struct DiagnosticsParser {
Expand Down
8 changes: 4 additions & 4 deletions Sources/SwiftToolchain/ToolchainManagement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public class ToolchainSystem {
#endif

terminal.logLookup(
"Response succesfully parsed, choosing from this number of assets: ",
"Response successfully parsed, choosing from this number of assets: ",
release.assets.count
)
let nameSuffixes = platformSuffixes.map { "\($0)_\(archSuffix)" }
Expand Down Expand Up @@ -236,7 +236,7 @@ public class ToolchainSystem {
}

public struct SwiftPath {
public var verison: String
public var version: String
public var swift: AbsolutePath
public var toolchain: AbsolutePath
}
Expand All @@ -262,7 +262,7 @@ public class ToolchainSystem {
for resolver in resolvers {
let toolchain = resolver.toolchain(for: swiftVersion)
if let path = try checkAndLog(installationPath: toolchain, terminal) {
return SwiftPath(verison: swiftVersion, swift: path, toolchain: toolchain)
return SwiftPath(version: swiftVersion, swift: path, toolchain: toolchain)
}
}

Expand Down Expand Up @@ -295,7 +295,7 @@ public class ToolchainSystem {
throw ToolchainError.invalidInstallationArchive(installationPath)
}

return SwiftPath(verison: swiftVersion, swift: path, toolchain: installationPath)
return SwiftPath(version: swiftVersion, swift: path, toolchain: installationPath)
}

public func fetchAllSwiftVersions() throws -> [String] {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftToolchain/Utilities/ProgressAnimation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public protocol ProgressAnimationProtocol {

/// Complete the animation.
/// - Parameters:
/// - success: Defines if the operation the animation represents was succesful.
/// - success: Defines if the operation the animation represents was successful.
func complete(success: Bool)

/// Clear the animation.
Expand Down