Skip to content

Commit 5d6793e

Browse files
committed
Merge pull request #803 from practicalswift/fix-typos-in-comments-and-docs
Fix typos in comments and docs
2 parents 7b9dcea + 0ae59b7 commit 5d6793e

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ with version 2 shipped with Ubuntu.
5656
If you are building on Ubuntu 14.04 LTS, you'll need to upgrade your clang
5757
compiler for C++14 support and create a symlink:
5858

59-
sudo apt-get install clang-3.6
60-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
61-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
59+
sudo apt-get install clang-3.6
60+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
61+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
6262

6363
### Getting Sources for Swift and Related Projects
6464

include/swift/Basic/Defer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212
//
13-
// This filed defines a 'defer' macro for performing a cleanup on any exit out
13+
// This file defines a 'defer' macro for performing a cleanup on any exit out
1414
// of a scope.
1515
//
1616
//===----------------------------------------------------------------------===//

include/swift/Basic/Fallthrough.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212
//
13-
// This filed defines a SWIFT_FALLTHROUGH macro to annotate intentional
13+
// This file defines a SWIFT_FALLTHROUGH macro to annotate intentional
1414
// fallthrough between switch cases. For compilers that support the
1515
// "clang::fallthrough" attribute, it expands to an empty statement with the
1616
// attribute applied; otherwise, it expands to just an empty statement.

lib/IDE/ModuleInterfacePrinting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ void swift::ide::printSwiftSourceInterface(SourceFile &File,
472472
ASTPrinter &Printer,
473473
const PrintOptions &Options) {
474474

475-
// We print all comments before the fist line of Swift code.
475+
// We print all comments before the first line of Swift code.
476476
printUntilFirstDeclStarts(File, Printer);
477477
File.print(Printer, Options);
478478
}

lib/SILGen/SILGenLValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ namespace {
562562
static bool isReadNoneFunction(const Expr *e) {
563563
// If this is a curried call to an integer literal conversion operations, then
564564
// we can "safely" assume it is readnone (btw, yes this is totally gross).
565-
// This is better to be attribute driven, ala rdar://15587352.
565+
// This is better to be attribute driven, a la rdar://15587352.
566566
if (auto *dre = dyn_cast<DeclRefExpr>(e)) {
567567
DeclName name = dre->getDecl()->getFullName();
568568
return (name.getArgumentNames().size() == 1 &&

lib/Sema/CSDiag.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4217,7 +4217,7 @@ bool FailureDiagnosis::visitClosureExpr(ClosureExpr *CE) {
42174217

42184218
// It is very common for a contextual type to disagree with the argument
42194219
// list built into the closure expr. This can be because the closure expr
4220-
// had an explicitly specified pattern, ala:
4220+
// had an explicitly specified pattern, a la:
42214221
// { a,b in ... }
42224222
// or could be because the closure has an implicitly generated one:
42234223
// { $0 + $1 }

test/SILOptimizer/devirt_inherited_conformance.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public protocol Comparable {
109109
// Define a custom operator to be used instead of ==
110110
infix operator --- { associativity left precedence 140 }
111111

112-
// Simple is a protocol tat simply defines an operator and
112+
// Simple is a protocol that simply defines an operator and
113113
// a few methods with different number of arguments.
114114
public protocol Simple {
115115
func foo(_: Self) -> Bool

0 commit comments

Comments
 (0)