Merge pull request #5599 from practicalswift/gardening-20161102

swift-ci · web-flow · commit 08349259e63d · 2016-11-02T00:45:24.000-07:00
diff --git a/include/swift/AST/Witness.h b/include/swift/AST/Witness.h
@@ -187,6 +187,6 @@ class Witness {
   void dump(llvm::raw_ostream &out) const;
 };
 
-} // end namepsace swift
+} // end namespace swift
 
 #endif // SWIFT_AST_WITNESS_H
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -991,7 +991,7 @@ RequirementEnvironment::RequirementEnvironment(
     return;
   }
 
-  // Form the conformance of the interface type of the confomance context
+  // Form the conformance of the interface type of the conformance context
   // to the requirement's enclosing protocol.
   ProtocolConformance *specialized = conformance;
   if (conformance && conformance->getGenericSignature()) {

Original file line number	Diff line number	Diff line change
`@@ -991,7 +991,7 @@ RequirementEnvironment::RequirementEnvironment(`
`991`	`991`	`return;`
`992`	`992`	`}`
`993`	`993`
`994`		`- // Form the conformance of the interface type of the confomance context`
	`994`	`+ // Form the conformance of the interface type of the conformance context`
`995`	`995`	`// to the requirement's enclosing protocol.`
`996`	`996`	`ProtocolConformance *specialized = conformance;`
`997`	`997`	`if (conformance && conformance->getGenericSignature()) {`