Revert "work around for suffix"

This reverts commit 489d50a.
pointfreeco · Nov 12, 2017 · 85ec24c · 85ec24c
1 parent 489d50a
commit 85ec24c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Sources/Diff/Diff.swift b/Sources/Diff/Diff.swift
@@ -7,10 +7,6 @@ public enum DiffType {
 public struct Diff<A> {
   public let type: DiffType
   public let elements: [A]
-
-  public func map<B>(_ f: (A) -> B) -> Diff<B> {
-    return .init(type: self.type, elements: self.elements.map(f))
-  }
 }
 
 public func diff<A: Hashable>(_ fst: [A], _ snd: [A]) -> [Diff<A>] {
@@ -87,8 +83,8 @@ public struct Hunk {
   }
 }
 
-public func chunk(diff diffs: [Diff<String>], context ctx: Int = 4) -> [Hunk] {
-  func prepending(_ prefix: String) -> (String) -> String {
+public func chunk<S: StringProtocol>(diff diffs: [Diff<S>], context ctx: Int = 4) -> [Hunk] {
+  func prepending(_ prefix: String) -> (S) -> String {
     return { prefix + $0 + ($0.hasSuffix(" ") ? "¬" : "") }
   }
   let changed: (Hunk) -> Bool = { $0.lines.contains(where: { $0.hasPrefix(minus) || $0.hasPrefix(plus) }) }
@@ -106,11 +102,11 @@ public func chunk(diff diffs: [Diff<String>], context ctx: Int = 4) -> [Hunk] {
           fstLen: ctx,
           sndIdx: current.sndIdx + current.sndLen + len - ctx,
           sndLen: ctx,
-          lines: (diff.elements.suffix(ctx) as ArraySlice<String>).map(prepending(figureSpace))
+          lines: (diff.elements.suffix(ctx) as ArraySlice<S>).map(prepending(figureSpace))
         )
         return (next, changed(hunk) ? hunks + [hunk] : hunks)
       case .both where current.lines.isEmpty:
-        let lines = (diff.elements.suffix(ctx) as ArraySlice<String>).map(prepending(figureSpace))
+        let lines = (diff.elements.suffix(ctx) as ArraySlice<S>).map(prepending(figureSpace))
         let count = lines.count
         return (current + Hunk(idx: len - count, len: count, lines: lines), hunks)
       case .both:

diff --git a/Sources/SnapshotTesting/Diffable.swift b/Sources/SnapshotTesting/Diffable.swift
@@ -39,8 +39,8 @@ extension String: Diffable {
     guard fst != snd else { return nil }
 
     let hunks = chunk(diff: diff(
-      fst.split(separator: "\n", omittingEmptySubsequences: false).map(String.init),
-      snd.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
+      fst.split(separator: "\n", omittingEmptySubsequences: false),
+      snd.split(separator: "\n", omittingEmptySubsequences: false)
     ))
     let failure = hunks.flatMap { [$0.patchMark] + $0.lines }.joined(separator: "\n")