Skip to content

Minor fixes #644

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.

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 10 commits into from
Sep 10, 2016
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
2 changes: 1 addition & 1 deletion Sources/Basic/KeyedPair.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/// Example:
///
/// struct Airport {
/// // The name of the aiport.
/// // The name of the airport.
/// let name: String
/// // The names of destination airports for outgoing flights.
/// let destinations: [String]
Expand Down
2 changes: 1 addition & 1 deletion Sources/Basic/OutputByteStream.swift
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public class OutputByteStream: TextOutputStream {
}

let writeUptoIndex = bytes.index(bytes.startIndex, offsetBy: availableBufferSize)
// Append whatever we can accomodate.
// Append whatever we can accommodate.
buffer += bytes.prefix(upTo: writeUptoIndex)

writeImpl(buffer)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Basic/Path.swift
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public func ==(lhs: RelativePath, rhs: RelativePath) -> Bool {
/// Make relative paths CustomStringConvertible.
extension RelativePath : CustomStringConvertible {
public var description: String {
// FIXME: We should realy be escaping backslashes and quotes here.
// FIXME: We should really be escaping backslashes and quotes here.
return "<RelativePath:\"\(asString)\">"
}
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Basic/TemporaryFile.swift
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public final class TemporaryFile {
/// goes out of scope.
///
/// - Parameters:
/// - dir: If specified the temporary file will be created in this directory otherwise enviornment variables
/// - dir: If specified the temporary file will be created in this directory otherwise environment variables
/// TMPDIR, TEMP and TMP will be checked for a value (in that order). If none of the env variables are
/// set, dir will be set to `/tmp/`.
/// - prefix: The prefix to the temporary file name.
Expand Down Expand Up @@ -170,7 +170,7 @@ public final class TemporaryDirectory {
/// Creates a temporary directory which is automatically removed when the object of this class goes out of scope.
///
/// - Parameters:
/// - dir: If specified the temporary directory will be created in this directory otherwise enviornment variables
/// - dir: If specified the temporary directory will be created in this directory otherwise environment variables
/// TMPDIR, TEMP and TMP will be checked for a value (in that order). If none of the env variables are
/// set, dir will be set to `/tmp/`.
/// - prefix: The prefix to the temporary file name.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Basic/TerminalController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public final class TerminalController {
///
/// - Returns: Current width of terminal if it was determinable.
public static func terminalWidth() -> Int? {
// Try to get from enviornment.
// Try to get from environment.
if let columns = POSIX.getenv("COLUMNS"), let width = Int(columns) {
return width
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Commands/SwiftTestTool.swift
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public struct SwiftTestTool: SwiftTool {
#endif

// Execute the XCTest with inherited environment as it is convenient to pass senstive
// information like username, password etc to test cases via enviornment variables.
// information like username, password etc to test cases via environment variables.
let result: Void? = try? system(args, environment: ProcessInfo.processInfo.environment)
return result != nil
}
Expand All @@ -306,7 +306,7 @@ public struct SwiftTestTool: SwiftTool {
if isFile(maybePath) {
return maybePath
}
// This will be true during swiftpm developement.
// This will be true during swiftpm development.
// FIXME: Factor all of the development-time resource location stuff into a common place.
let path = binDirectory.appending(component: xctestHelperBin)
if isFile(path) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/TestSupport/SwiftPMProduct.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public enum SwiftPMProduct {
///
/// - Parameters:
/// - args: The arguments to pass.
/// - env: Enviroment variables to pass. Enviroment will never be inherited.
/// - env: Environment variables to pass. Environment will never be inherited.
/// - chdir: Adds argument `--chdir <path>` if not nil.
/// - printIfError: Print the output on non-zero exit.
///
Expand Down
4 changes: 2 additions & 2 deletions Sources/Utility/PkgConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public struct PkgConfig {

/// The built-in search path list.
///
/// By default, this is combined with the search paths infered from
/// By default, this is combined with the search paths inferred from
/// `pkg-config` itself.
private static let searchPaths = [
AbsolutePath("/usr/local/lib/pkgconfig"),
Expand Down Expand Up @@ -185,7 +185,7 @@ struct PkgConfigParser {
return depString.characters[depString.characters.index(depString.characters.startIndex, offsetBy: idx)]
}

// This converts the string which can be seperated by comma or spaces
// This converts the string which can be separated by comma or spaces
// into an array of string.
func tokenize() -> [String] {
var tokens = [String]()
Expand Down
2 changes: 1 addition & 1 deletion Tests/BasicTests/KeyedPairTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Basic
class KeyedPairTests: XCTestCase {
func testBasics() {
class Airport {
// The name of the aiport.
// The name of the airport.
let name: String
// The destination airports for outgoing flights.
var destinations: [Airport] = []
Expand Down
2 changes: 1 addition & 1 deletion Tests/BasicTests/TemporaryFileTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class TemporaryFileTests: XCTestCase {
stream <<< "baz"
try fputs(stream.bytes.contents, file.fileHandle)

// Go to the begining of the file.
// Go to the beginning of the file.
file.fileHandle.seek(toFileOffset: 0)
// Read the contents.
let contents = try? file.fileHandle.readFileContents()
Expand Down
2 changes: 1 addition & 1 deletion Utilities/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ def process_runtime_libraries(build_path, args, bootstrap=False):
# Unqoute any quoted characters.
link_cmd = [arg.replace("\\", "") for arg in link_cmd]

# Drop any .o files, and the -Xlinker which preceeds '-shared'.
# Drop any .o files, and the -Xlinker which precedes '-shared'.
try:
idx = link_cmd.index("-shared")
except:
Expand Down