Merge pull request #4067 from practicalswift/gardening-20160806

Author: swift-ci

include/swift/AST/DiagnosticsParse.def

@@ -1106,8 +1106,6 @@ ERROR(expr_selector_expected_rparen,PointsToFirstBadToken,
       "expected ')' to complete '#selector' expression", ())
 
 // Type-of expressions.
-ERROR(expr_typeof_expected_lparen,PointsToFirstBadToken,
-      "expected '(' following 'type'", ())
 ERROR(expr_typeof_expected_label_of,PointsToFirstBadToken,
       "expected argument label 'of:' within 'type(...)'", ())
 ERROR(expr_typeof_expected_expr,PointsToFirstBadToken,

include/swift/AST/DiagnosticsSema.def

@@ -2458,8 +2458,6 @@ ERROR(cannot_infer_type_for_pattern,none,
       "type annotation missing in pattern", ())
 ERROR(refutable_pattern_requires_initializer,none,
       "pattern matching requires an initializer value to match against", ())
-ERROR(invalid_pattern,none,
-      "invalid pattern", ())
 WARNING(var_pattern_didnt_bind_variables,none,
         "'%0' pattern has no effect; sub-pattern didn't bind any variables",
         (StringRef))

lib/ClangImporter/ImportDecl.cpp

@@ -6087,7 +6087,7 @@ namespace {
 
     Decl *
     VisitObjCCompatibleAliasDecl(const clang::ObjCCompatibleAliasDecl *decl) {
-      // Import Objective-C’s @compatibility_alias as typealias.
+      // Import Objective-C's @compatibility_alias as typealias.
       EffectiveClangContext effectiveContext(decl->getDeclContext()->getRedeclContext());
       auto dc = Impl.importDeclContextOf(decl, effectiveContext);
       if (!dc) return nullptr;

lib/Sema/CSDiag.cpp

@@ -1948,7 +1948,7 @@ class FailureDiagnosis :public ASTVisitor<FailureDiagnosis, /*exprresult*/bool>{
   /// the exact expression kind).
   bool diagnoseGeneralMemberFailure(Constraint *constraint);
 
-  /// Diagnose the lookup of an static member or enum element as instance member.
+  /// Diagnose the lookup of a static member or enum element as instance member.
   void diagnoseTypeMemberOnInstanceLookup(Type baseObjTy,
                                           Expr *baseExpr,
                                           DeclName memberName,

stdlib/public/core/FloatingPointParsing.swift.gyb

@@ -102,7 +102,7 @@ extension ${Self} : LosslessStringConvertible {
   ///       // n?.isNaN == true
   ///       // n?.sign == .minus
   ///
-  ///   An NaN value may also include a payload in parentheses following the
+  ///   A NaN value may also include a payload in parentheses following the
   ///   `"nan"` keyword. The payload consists of a sequence of decimal digits,
   ///   or the characters `0X` or `0x` followed by a sequence of hexadecimal
   ///   digits. If the payload contains any other characters, it is ignored.

stdlib/public/core/Mirror.swift

@@ -385,7 +385,7 @@ public protocol CustomLeafReflectable : CustomReflectable {}
 ///
 /// Do not declare new conformances to this protocol; they will not
 /// work as expected.
-// FIXME(ABI): this protocol should be “non-open” and you shouldn't be able to
+// FIXME(ABI): this protocol should be "non-open" and you shouldn't be able to
 // create conformances.
 public protocol MirrorPath {}
 extension IntMax : MirrorPath {}

stdlib/public/core/SequenceAlgorithms.swift.gyb

@@ -260,7 +260,7 @@ ${equivalenceExplanation}
   ///     print(b.starts(with: a))
   ///     // Prints "true"
   ///
-  /// Passing an sequence with no elements or an empty collection as
+  /// Passing a sequence with no elements or an empty collection as
   /// `possiblePrefix` always results in `true`.
   ///
   ///     print(b.starts(with: []))

test/1_stdlib/CollectionCasts.swift.gyb

@@ -1,4 +1,4 @@
-//===--- CollectionCasts.swift.gyb ----------------------------------------===//
+//===--- CollectionCasts.swift.gyb ----------------------------*- swift -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

test/Prototypes/Algorithms.swift.gyb

@@ -1,4 +1,4 @@
-//===--- Algorithms.swift.gyb ---------------------------------------------===//
+//===--- Algorithms.swift.gyb ---------------------------------*- swift -*-===//
 //
 // This source file is part of the Swift.org open source project
 //