Adjust for SE-0065 "A New Model for Collections and Indices"

Author: gribozavr

Sources/Build/PkgConfig.swift

@@ -101,13 +101,13 @@ struct PkgConfigParser {
  guard let line = uncommentedLine.chuzzle() else { continue }
 
  if let colonIndex = line.characters.index(of: ":") where
- line.endIndex == line.characters.location(after: colonIndex) || line[line.characters.location(after: colonIndex)] == " " {
+ line.endIndex == line.characters.index(after: colonIndex) || line[line.characters.index(after: colonIndex)] == " " {
  // Found a key-value pair.
  try parseKeyValue(line: line)
  } else if let equalsIndex = line.characters.index(of: "=") {
  // Found a variable.
  let name = line[line.startIndex..<equalsIndex]
- let value = line[line.location(after: equalsIndex)..<line.endIndex]
+ let value = line[line.index(after: equalsIndex)..<line.endIndex]
  variables[name] = try resolveVariables(value)
  } else {
  // unexpected thing in the pc file, abort.
@@ -136,7 +136,7 @@ struct PkgConfigParser {
  // Look at a char at an index if present.
  func peek(idx: Int) -> Character? {
  guard idx <= depString.characters.count - 1 else { return nil }
- return depString.characters[depString.characters.location(depString.characters.startIndex, offsetBy: idx)]
+ return depString.characters[depString.characters.index(depString.characters.startIndex, offsetBy: idx)]
  }
 
  // This converts the string which can be seperated by comma or spaces
@@ -189,9 +189,9 @@ struct PkgConfigParser {
  // We make sure it of form ${name} otherwise it is not a variable.
  func findVariable(_ fragment: String) -> (name: String, startIndex: StringIndex, endIndex: StringIndex)? {
  guard let dollar = fragment.characters.index(of: "$") else { return nil }
- guard dollar != fragment.endIndex && fragment.characters[fragment.location(after: dollar)] == "{" else { return nil }
+ guard dollar != fragment.endIndex && fragment.characters[fragment.index(after: dollar)] == "{" else { return nil }
  guard let variableEndIndex = fragment.characters.index(of: "}") else { return nil }
- return (fragment[fragment.location(dollar, offsetBy: 2)..<variableEndIndex], dollar, variableEndIndex)
+ return (fragment[fragment.index(dollar, offsetBy: 2)..<variableEndIndex], dollar, variableEndIndex)
  }
 
  var result = ""
@@ -207,7 +207,7 @@ struct PkgConfigParser {
  // Append the value of the variable.
  result += variableValue
  // Update the fragment with post variable string.
- fragment = fragment[fragment.location(after: variable.endIndex)..<fragment.characters.endIndex]
+ fragment = fragment[fragment.index(after: variable.endIndex)..<fragment.characters.endIndex]
  } else {
  // No variable found, just append rest of the fragment to result.
  result += fragment
@@ -221,6 +221,6 @@ struct PkgConfigParser {
  guard let colonIndex = line.characters.index(of: ":") else {
  return ""
  }
- return line[line.location(colonIndex, offsetBy: 2)..<line.endIndex]
+ return line[line.index(colonIndex, offsetBy: 2)..<line.endIndex]
  }
 }

Sources/ManifestParser/TOML.swift

@@ -205,11 +205,11 @@ private struct Lexer {
 
  // Consume and cache the next character.
  lookahead = utf8[index]
- nextIndex = utf8.location(after: index)
+ nextIndex = utf8.index(after: index)
 
  // Normalize line endings.
  if lookahead == UInt8(ascii: "\r") && utf8[nextIndex!] == UInt8(ascii: "\n") {
- nextIndex = utf8.location(after: nextIndex!)
+ nextIndex = utf8.index(after: nextIndex!)
  lookahead = UInt8(ascii: "\n")
  }
 
@@ -269,7 +269,7 @@ private struct Lexer {
  break
  }
  }
- return .StringLiteral(value: String(utf8[utf8.location(after: startIndex)..<endIndex]))
+ return .StringLiteral(value: String(utf8[utf8.index(after: startIndex)..<endIndex]))
 
  // Numeric literals.
  //

Sources/OptionsParser/OptionsParser.swift

@@ -87,7 +87,7 @@ private func split(_ arg: String) -> (String, String?) {
  let chars = arg.characters
  if let ii = chars.index(of: "=") {
  let flag = chars.prefix(upTo: ii)
- let value = chars.suffix(from: chars.location(after: ii))
+ let value = chars.suffix(from: chars.index(after: ii))
  return (String(flag), String(value))
  } else {
  return (arg, nil)

Sources/PackageDescription/Version+StringLiteralConvertible.swift

@@ -47,15 +47,15 @@ extension Version {
 
  if let prereleaseStartIndex = prereleaseStartIndex {
  let prereleaseEndIndex = metadataStartIndex ?? characters.endIndex
- let prereleaseCharacters = characters[characters.location(after: prereleaseStartIndex)..<prereleaseEndIndex]
+ let prereleaseCharacters = characters[characters.index(after: prereleaseStartIndex)..<prereleaseEndIndex]
  prereleaseIdentifiers = prereleaseCharacters.split(separator: ".").map{ String($0) }
  } else {
  prereleaseIdentifiers = []
  }
 
  var buildMetadataIdentifier: String? = nil
  if let metadataStartIndex = metadataStartIndex {
- let buildMetadataCharacters = characters.suffix(from: characters.location(after: metadataStartIndex))
+ let buildMetadataCharacters = characters.suffix(from: characters.index(after: metadataStartIndex))
  if !buildMetadataCharacters.isEmpty {
  buildMetadataIdentifier = String(buildMetadataCharacters)
  }

Sources/PackageType/Package.swift

@@ -56,7 +56,7 @@ extension Package {
  case "http", "https", "git", "ssh":
  if url.hasSuffix(".git") {
  let a = base.startIndex
- let b = base.location(base.endIndex, offsetBy: -4)
+ let b = base.index(base.endIndex, offsetBy: -4)
  return base[a..<b]
  } else {
  fallthrough

Sources/Utility/Git.swift

@@ -87,7 +87,7 @@ public class Git {
  let prefix = "git version"
  var version = self.version
  if version.hasPrefix(prefix) {
- let prefixRange = version.startIndex...version.location(version.startIndex, offsetBy: prefix.characters.count)
+ let prefixRange = version.startIndex...version.index(version.startIndex, offsetBy: prefix.characters.count)
  version.removeSubrange(prefixRange)
  }
  guard let first = version.characters.first else {

Sources/Utility/Path.swift

@@ -290,12 +290,12 @@ extension String {
  let end = utf8.endIndex
  while idx != end {
  if utf8[idx] == UInt8(ascii: "/") {
- utf8.formLocation(after: &idx)
+ utf8.formIndex(after: &idx)
  if idx == end || utf8[idx] == UInt8(ascii: "/") {
  return false
  }
  }
- utf8.formLocation(after: &idx)
+ utf8.formIndex(after: &idx)
  }
  return true
  }

Sources/Utility/StringExtensions.swift

@@ -18,7 +18,7 @@ extension String {
  func scrub(_ separator: String) -> String {
  var E = endIndex
  while self[startIndex..<E].hasSuffix(separator) && E > startIndex {
- E = location(before: E)
+ E = index(before: E)
  }
  return self[startIndex..<E]
  }

Sources/libc/String+Linux.swift

@@ -19,7 +19,7 @@
  }
  // FIXME: the complexity of this algorithm is O(n^2).
  for i in 0..<str.utf8.count {
- if utf8[utf8.location(utf8.startIndex, offsetBy: i)] != str.utf8[str.utf8.location(str.utf8.startIndex, offsetBy: i)] {
+ if utf8[utf8.index(utf8.startIndex, offsetBy: i)] != str.utf8[str.utf8.index(str.utf8.startIndex, offsetBy: i)] {
  return false
  }
  }
@@ -34,7 +34,7 @@
  }
  // FIXME: the complexity of this algorithm is O(n^2).
  for i in 0..<strCount {
- if utf8[utf8.location(utf8.startIndex, offsetBy: count-i-1)] != str.utf8[str.utf8.location(str.utf8.startIndex, offsetBy: strCount-i-1)] {
+ if utf8[utf8.index(utf8.startIndex, offsetBy: count-i-1)] != str.utf8[str.utf8.index(str.utf8.startIndex, offsetBy: strCount-i-1)] {
  return false
  }
  }

Tests/Transmute/ModuleDependencyTests.swift

@@ -111,7 +111,7 @@ class ModuleDependencyTests: XCTestCase {
 
  // precise order is not important, but it is important that the following are true
  let t6rd = t6.recursiveDeps
- XCTAssertEqual(t6rd.index(of: t3)!, t6rd.location(after: t6rd.index(of: t4)!))
+ XCTAssertEqual(t6rd.index(of: t3)!, t6rd.index(after: t6rd.index(of: t4)!))
  XCTAssert(t6rd.index(of: t5)! < t6rd.index(of: t2)!)
  XCTAssert(t6rd.index(of: t5)! < t6rd.index(of: t1)!)
  XCTAssert(t6rd.index(of: t2)! < t6rd.index(of: t1)!)
@@ -142,7 +142,7 @@ class ModuleDependencyTests: XCTestCase {
 
  // precise order is not important, but it is important that the following are true
  let t6rd = t6.recursiveDeps
- XCTAssertEqual(t6rd.index(of: t3)!, t6rd.location(after: t6rd.index(of: t4)!))
+ XCTAssertEqual(t6rd.index(of: t3)!, t6rd.index(after: t6rd.index(of: t4)!))
  XCTAssert(t6rd.index(of: t5)! < t6rd.index(of: t2)!)
  XCTAssert(t6rd.index(of: t5)! < t6rd.index(of: t1)!)
  XCTAssert(t6rd.index(of: t2)! < t6rd.index(of: t1)!)