Remove unused diff type

azzsal · NathanReb · commit f3bd0b2b79e1 · 2024-10-08T15:39:01.000+02:00
diff --git a/lib/text_diff.ml b/lib/text_diff.ml
@@ -1,8 +1,7 @@
 open Types
 
 type conflict2 = { orig : string list; new_ : string list }
-type diff = Diff of conflict2
-type t = diff list String_map.t
+type t = conflict2 list String_map.t
 type printer = { same : string Fmt.t; diff : conflict2 Fmt.t }
 
 let printer ~same ~diff = { same; diff }
@@ -17,7 +16,7 @@ let git_printer =
   }
 
 let pp_ diff_printer =
-  let pp_dh ppf dh = match dh with Diff c -> diff_printer.diff ppf c in
+  let pp_dh ppf dh = match dh with c -> diff_printer.diff ppf c in
   Fmt.list ~sep:Fmt.nop pp_dh
 
 let vd_to_lines name vd =
@@ -37,35 +36,34 @@ let md_to_lines name md =
 
 let process_value_diff (val_diff : Diff.value) =
   match val_diff.vdiff with
-  | Added vd -> [ Diff { orig = []; new_ = vd_to_lines val_diff.vname vd } ]
-  | Removed vd -> [ Diff { orig = vd_to_lines val_diff.vname vd; new_ = [] } ]
+  | Added vd -> [ { orig = []; new_ = vd_to_lines val_diff.vname vd } ]
+  | Removed vd -> [ { orig = vd_to_lines val_diff.vname vd; new_ = [] } ]
   | Modified { reference; current } ->
       [
-        Diff
-          {
-            orig = vd_to_lines val_diff.vname reference;
-            new_ = vd_to_lines val_diff.vname current;
-          };
+        {
+          orig = vd_to_lines val_diff.vname reference;
+          new_ = vd_to_lines val_diff.vname current;
+        };
       ]
 
 let from_diff (diff : Diff.module_) : t =
   let rec process_module_diff module_path (module_diff : Diff.module_) acc =
     match module_diff.mdiff with
     | Modified Unsupported ->
         String_map.add module_path
-          [ Diff { orig = []; new_ = [ "<unsupported change>" ] } ]
+          [ { orig = []; new_ = [ "<unsupported change>" ] } ]
           acc
     | Added curr_md ->
         let diff =
-          [ Diff { orig = []; new_ = md_to_lines module_diff.mname curr_md } ]
+          [ { orig = []; new_ = md_to_lines module_diff.mname curr_md } ]
         in
         String_map.update module_path
           (function
             | None -> Some diff | Some existing -> Some (existing @ diff))
           acc
     | Removed ref_md ->
         let diff =
-          [ Diff { orig = md_to_lines module_diff.mname ref_md; new_ = [] } ]
+          [ { orig = md_to_lines module_diff.mname ref_md; new_ = [] } ]
         in
         String_map.update module_path
           (function
diff --git a/lib/text_diff.mli b/lib/text_diff.mli
@@ -1,9 +1,8 @@
 (** Utilities for custom diff printing  *)
 
 type conflict2 = { orig : string list; new_ : string list }
-type diff = Diff of conflict2
 
-type t = diff list String_map.t
+type t = conflict2 list String_map.t
 (** Type for representing library interface diffs as text diff.
 
     Changes are arranged per fully qualified module path.
