Merge pull request #9146 from CodaFi/to-no-avail

Author: swift-ci

include/swift/AST/DiagnosticsParse.def

@@ -1477,7 +1477,7 @@ ERROR(avail_query_argument_and_shorthand_mix_not_allowed, PointsToFirstBadToken,
       (StringRef, StringRef))
 
 NOTE(avail_query_meant_introduced,PointsToFirstBadToken,
-     "did you mean to use '%0, introduced: %1'?", (StringRef, StringRef))
+     "did you mean to specify an introduction version?", ())
 
 ERROR(avail_query_version_comparison_not_needed,
       none,"version comparison not needed", ())

lib/Parse/ParseStmt.cpp

@@ -1137,11 +1137,8 @@ Parser::parseAvailabilitySpecList(SmallVectorImpl<AvailabilitySpec *> &Specs) {
                 PlatformSpec->getPlatformLoc().getAdvancedLoc(
                     PlatformName.size());
 
-            StringRef VersionName = PlatformSpec->getVersion().getAsString();
-
             diagnose(PlatformSpec->getPlatformLoc(),
-                     diag::avail_query_meant_introduced, PlatformName,
-                     VersionName)
+                     diag::avail_query_meant_introduced)
                 .fixItInsert(PlatformNameEndLoc, ", introduced:");
           }
 

test/Parse/diagnose_availability.swift

@@ -10,7 +10,7 @@ func introducedFollowedByDeprecated() {}
 
 @available(OSX 10.0, deprecated: 10.12)
 // expected-error@-1 {{'deprecated' can't be combined with shorthand specification 'OSX 10.0'}}
-// expected-note@-2 {{did you mean to use 'OSX, introduced: 10.0'?}} {{15-15=, introduced:}}
+// expected-note@-2 {{did you mean to specify an introduction version?}} {{15-15=, introduced:}}
 // expected-error@-3 {{expected declaration}}
 func shorthandFollowedByDeprecated() {}