[stdlib] String.Index: conform to CustomDebugStringConvertible instead

Apply the LSG’s modifications as detailed in their review notes.

Author: lorentey

stdlib/public/core/StringIndex.swift

@@ -524,53 +524,43 @@ extension String.Index {
     }
   }
 
-  /// A textual representation of this instance.
+  /// A textual representation of this instance, intended for debugging.
   ///
   /// - Important: The contents of the returned string are not guaranteed to
   ///    remain stable: they may arbitrarily change in any Swift release.
   @_alwaysEmitIntoClient // FIXME: Use @backDeployed
   @inline(never)
-  public var description: String {
+  public var debugDescription: String {
     // 23[utf8]+1
     var d = "\(_encodedOffset)[\(_encodingDescription)]"
     if transcodedOffset != 0 {
       d += "+\(transcodedOffset)"
     }
     return d
   }
+}
+
+@available(SwiftStdlib 6.1, *)
+extension String.Index: CustomDebugStringConvertible {}
 
-  /// A textual representation of this instance.
+extension String.Index {
+  /// A textual representation of this instance, intended for debugging.
+  ///
+  /// - Important: The contents of the returned string are not guaranteed to
+  ///    remain stable: they may arbitrarily change in any Swift release.
   @_alwaysEmitIntoClient
-  @available(*, deprecated, renamed: "description")
+  @available(*, deprecated, renamed: "debugDescription")
   public var _description: String {
     description
   }
-}
 
-@available(SwiftStdlib 6.1, *)
-extension String.Index: CustomStringConvertible {}
-
-extension String.Index {
-  /// A more detailed description of this string index.
+  /// A textual representation of this instance, intended for debugging.
+  ///
+  /// - Important: The contents of the returned string are not guaranteed to
+  ///    remain stable: they may arbitrarily change in any Swift release.
   @_alwaysEmitIntoClient
-  @inline(never)
+  @available(*, deprecated, renamed: "debugDescription")
   public var _debugDescription: String {
-    /// Note: This would not make a good `debugDescription`; the current
-    /// `description` is fine for that.
-    var d = "String.Index("
-    d += "offset: \(_encodedOffset)[\(_encodingDescription)]"
-    if transcodedOffset != 0 {
-      d += "+\(transcodedOffset)"
-    }
-    if _isCharacterAligned {
-      d += ", aligned: character"
-    } else if _isScalarAligned {
-      d += ", aligned: scalar"
-    }
-    if let stride = characterStride {
-      d += ", stride: \(stride)"
-    }
-    d += ")"
-    return d
+    debugDescription
   }
 }

test/stdlib/StringIndex.swift

@@ -1240,11 +1240,11 @@ if #available(SwiftStdlib 6.1, *) {
   }
 }
 
-suite.test("String index description backdeployment") {
+suite.test("String index debugDescription backdeployment") {
   // Note: no availability check
   let str = "i\u{308}"
-  expectEqual(str.startIndex.description, "0[any]")
-  expectEqual(str.endIndex.description, "3[utf8]")
+  expectEqual(str.startIndex.debugDescription, "0[any]")
+  expectEqual(str.endIndex.debugDescription, "3[utf8]")
 }