Merge pull request #9662 from practicalswift/gardening-2017-05-16

[gardening] Remove unused diagnostic. Remove unused variable. Fix spacing and headers.

Author: practicalswift

include/swift/AST/DiagnosticsParse.def

@@ -1435,9 +1435,6 @@ ERROR(unsupported_platform_runtime_condition_argument,none,
 ERROR(unsupported_platform_condition_argument,none,
       "unexpected platform condition argument: expected %0",
       (StringRef))
-ERROR(unexpected_version_comparison_operator,none,
-      "expected '>=' prefix operator on a version requirement",
-      ())
 ERROR(unsupported_conditional_compilation_expression_type,none,
       "invalid conditional compilation expression", ())
 WARNING(swift3_unsupported_conditional_compilation_expression_type,none,

lib/Parse/ParseIfConfig.cpp

@@ -265,7 +265,7 @@ class ValidateIfConfigCondition :
 
       auto Val = version::Version::parseCompilerVersionString(
           SLE->getValue(), SLE->getLoc(), &D);
-      if(!Val.hasValue())
+      if (!Val.hasValue())
         return nullptr;
       return E;
     }
@@ -284,7 +284,7 @@ class ValidateIfConfigCondition :
       auto versionString = extractExprSource(Ctx.SourceMgr, PUE->getArg());
       auto Val = version::Version::parseVersionString(
           versionString, PUE->getArg()->getStartLoc(), &D);
-      if(!Val.hasValue())
+      if (!Val.hasValue())
         return nullptr;
       return E;
     }

lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp

@@ -727,7 +727,6 @@ bool swift::isPureCall(FullApplySite AI, SideEffectAnalysis *SEA) {
     return false;
   // Check if all parameters are constant.
   auto Args = AI.getArgumentsWithoutIndirectResults();
-  bool allArgsConstant = true;
   for (auto Arg : Args) {
     if (!isConstantValue(Arg)) {
       return false;

stdlib/public/SwiftShims/NSCharacterSetShims.h

@@ -1,4 +1,4 @@
-//===--- NSCharacterSetShims.h - Foundation declarations for CharacterSet overlay -----===//
+//===--- NSCharacterSetShims.h - Foundation decl. for CharacterSet overlay ===//
 //
 // This source file is part of the Swift.org open source project
 //