Merge pull request #5364 from practicalswift/gardening-20161019

Author: swift-ci

lib/IRGen/SwitchBuilder.h

@@ -1,4 +1,4 @@
-//===--- SwitchBuilder.h --------------------------------------------------===//
+//===--- SwitchBuilder.h ----------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/Parse/ParseType.cpp

@@ -446,7 +446,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
     if (auto Comp = dyn_cast<CompositionTypeRepr>(T)) {
       // Accept protocol<P1, P2> & P3; explode it.
       auto TyRs = Comp->getTypes();
-      if (!TyRs.empty()) // If empty, is 'Any'; igone.
+      if (!TyRs.empty()) // If empty, is 'Any'; ignore.
         Types.append(TyRs.begin(), TyRs.end());
       return;
     }

lib/Sema/TypeCheckType.cpp

@@ -2614,7 +2614,7 @@ Type TypeResolver::resolveTupleType(TupleTypeRepr *repr,
   return TupleType::get(elements, Context);
 }
 
-/// Restore Swift3 behavior of ambiguous compostion for source compatibility.
+/// Restore Swift3 behavior of ambiguous composition for source compatibility.
 ///
 /// Currently, 'P1 & P2.Type' is parsed as (composition P1, (metatype P2))
 /// In Swift3, that was (metatype (composition P1, P2)).
@@ -2674,7 +2674,7 @@ static TypeRepr *fixCompositionWithPostfix(TypeChecker &TC,
   SmallVector<TypeRepr *, 4> Protocols(Types.begin(), Types.end() - 1);
   Protocols.push_back(LastType);
 
-  // Emit fix-it to enclose compostion part into parentheses.
+  // Emit fix-it to enclose composition part into parentheses.
   TypeRepr *InnerMost = Postfixes.back();
   TC.diagnose(InnerMost->getLoc(), diag::protocol_composition_with_postfix,
       isa<ProtocolTypeRepr>(InnerMost) ? ".Protocol" :

test/Compatibility/protocol_composition.swift

@@ -13,7 +13,7 @@ protocol P2 {
 
 // BEGIN swift3.swift
 
-// Warning for mitakingly accepted protocol composition production.
+// Warning for mistakenly accepted protocol composition production.
 func foo(x: P1 & Any & P2.Type?) {
   // expected-warning @-1 {{protocol composition with postfix '.Type' is ambiguous and will be rejected in future version of Swift}} {{13-13=(}} {{26-26=)}}
   let _: (P1 & P2).Type? = x