---

yaml
---
r: 347203
b: refs/heads/master
c: 351c380
h: refs/heads/master
i:
  347201: 76a0906
  347199: 0110c1c

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c6a831ad5ed1a6f08a33769d8a4ede8f7fc74b92
+refs/heads/master: 351c38018b21c35194f036213c1fe72645d5bbe5
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Basic/LangOptions.h

@@ -274,12 +274,6 @@ namespace swift {
     std::shared_ptr<llvm::Regex> OptimizationRemarkPassedPattern;
     std::shared_ptr<llvm::Regex> OptimizationRemarkMissedPattern;
 
-    /// When a conversion from String to Substring fails, emit a fix-it to append
-    /// the void subscript '[]'.
-    /// FIXME: Remove this flag when void subscripts are implemented.
-    /// This is used to guard preemptive testing for the fix-it.
-    bool FixStringToSubstringConversions = false;
-
     /// Whether collect tokens during parsing for syntax coloring.
     bool CollectParsedToken = false;
 

trunk/include/swift/Option/FrontendOptions.td

@@ -533,11 +533,6 @@ def validate_tbd_against_ir_EQ: Joined<["-"], "validate-tbd-against-ir=">,
     HelpText<"Compare the symbols in the IR against the TBD file that would be generated.">,
     MetaVarName<"<level>">;
 
-// FIXME: Remove this flag when void subscripts are implemented.
-// This is used to guard preemptive testing for the fix-it.
-def fix_string_substring_conversion: Flag<["-"], "fix-string-substring-conversion">,
-    HelpText<"Emit a fix-it to append '[]' to String expressions when converting to Substring.">;
-    
 def bypass_batch_mode_checks: Flag<["-"], "bypass-batch-mode-checks">,
     HelpText<"Bypass checks for batch-mode errors.">;
 

trunk/lib/Frontend/CompilerInvocation.cpp

@@ -201,12 +201,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
                           const FrontendOptions &FrontendOpts) {
   using namespace options;
 
-  /// FIXME: Remove this flag when void subscripts are implemented.
-  /// This is used to guard preemptive testing for the fix-it.
-  if (Args.hasArg(OPT_fix_string_substring_conversion)) {
-    Opts.FixStringToSubstringConversions = true;
-  }
-
   if (auto A = Args.getLastArg(OPT_swift_version)) {
     auto vers = version::Version::parseVersionString(
       A->getValue(), SourceLoc(), &Diags);

trunk/lib/Sema/CSDiagnostics.cpp

@@ -1364,19 +1364,6 @@ bool ContextualFailure::trySequenceSubsequenceFixIts(InFlightDiagnostic &diag,
   if (!String || !Substring)
     return false;
 
-  /// FIXME: Remove this flag when void subscripts are implemented.
-  /// Make this unconditional and remove the if statement.
-  if (CS.TC.getLangOpts().FixStringToSubstringConversions) {
-    // String -> Substring conversion
-    // Add '[]' void subscript call to turn the whole String into a Substring
-    if (fromType->isEqual(String)) {
-      if (toType->isEqual(Substring)) {
-        diag.fixItInsertAfter(expr->getEndLoc(), "[]");
-        return true;
-      }
-    }
-  }
-
   // Substring -> String conversion
   // Wrap in String.init
   if (fromType->isEqual(Substring)) {