Skip to content

[gardening] Fix inconsistent headers. Fix typos. Fix a vs. an issues. #5009

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 3 commits into from
Sep 25, 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
4 changes: 2 additions & 2 deletions include/swift/AST/DeclContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,13 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {

/// Gets the type being declared by this context.
///
/// - Generic types return an bound generic type using archetypes.
/// - Generic types return a bound generic type using archetypes.
/// - Non-type contexts return a null type.
Type getDeclaredTypeInContext() const;

/// Gets the type being declared by this context.
///
/// - Generic types return an bound generic type using interface types.
/// - Generic types return a bound generic type using interface types.
/// - Non-type contexts return a null type.
Type getDeclaredInterfaceType() const;

Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/GenericEnvironment.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class GenericEnvironment final {
/// Map an interface type to a contextual type.
Type mapTypeIntoContext(ModuleDecl *M, Type type) const;

/// Map an generic parameter type to a contextual type.
/// Map a generic parameter type to a contextual type.
Type mapTypeIntoContext(GenericTypeParamType *type) const;

/// Derive a contextual type substitution map from a substitution array.
Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/KnownStdlibTypes.def
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- KnownStdlibTypes.cpp - Common standard library types -------------===//
//===--- KnownStdlibTypes.def - Common standard library types ---*- C++ -*-===//
//
// This source file is part of the Swift.org open source project
//
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/Foundation/NSValue.swift.gyb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- NSValue.swift - Bridging things in NSValue -----------------------===//
//===--- NSValue.swift - Bridging things in NSValue -----------*- swift -*-===//
//
// This source file is part of the Swift.org open source project
//
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/QuartzCore/NSValue.swift.gyb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- NSValue.swift - Bridging things in NSValue -----------------------===//
//===--- NSValue.swift - Bridging things in NSValue -----------*- swift -*-===//
//
// This source file is part of the Swift.org open source project
//
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/core/UnsafeRawBufferPointer.swift.gyb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===--- UnsafeRawBufferPointer.swift.gyb --------------------*- swift -*-===//
//===--- UnsafeRawBufferPointer.swift.gyb ---------------------*- swift -*-===//
//
// This source file is part of the Swift.org open source project
//
Expand Down Expand Up @@ -65,7 +65,7 @@
///
/// Example (continued):
/// ```swift
/// // Copy a another slice of memory back into the original slice.
/// // Copy another slice of memory back into the original slice.
/// destBytes[0..<n] = someBytes[m..<(m+n)]
/// ```
///
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/UnsafeRawBufferPointer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ UnsafeRawBufferPointerTestSuite.test("empty") {
}

// Store a sequence of integers to raw memory, and reload them as structs.
// Strore structs to raw memory, and reload them as integers.
// Store structs to raw memory, and reload them as integers.
UnsafeRawBufferPointerTestSuite.test("reinterpret") {
struct Pair {
var x: Int32
Expand Down