From 6b44eaf2e69533e35815ab676fe4b5b684559e9a Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Thu, 9 Jul 2020 07:43:03 -0700
Subject: [PATCH] [sledge] Style: set ocamlformat config break-struct = force

Reviewed By: ngorogiannis

Differential Revision: D22170511

fbshipit-source-id: de50aef7c
---
 sledge/.ocamlformat       | 6 +++---
 sledge/nonstdlib/NS.mli   | 8 ++++++--
 sledge/src/llair/exp.ml   | 7 ++++++-
 sledge/src/llair/llair.ml | 5 ++++-
 sledge/src/llair/reg.mli  | 4 +++-
 sledge/src/term.ml        | 6 +++++-
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/sledge/.ocamlformat b/sledge/.ocamlformat
index f1e2c374e..a0181b555 100644
--- a/sledge/.ocamlformat
+++ b/sledge/.ocamlformat
@@ -1,8 +1,8 @@
-profile = compact
-break-before-in = fit-or-vertical
-break-collection-expressions = fit-or-vertical
+profile = ocamlformat
+break-cases = fit
 break-infix = fit-or-vertical
 break-sequences = true
 margin = 76
+module-item-spacing = compact
 parse-docstrings = true
 wrap-comments = true
diff --git a/sledge/nonstdlib/NS.mli b/sledge/nonstdlib/NS.mli
index 859a0e412..5ad4b6f01 100644
--- a/sledge/nonstdlib/NS.mli
+++ b/sledge/nonstdlib/NS.mli
@@ -103,7 +103,9 @@ module String : sig
 end
 
 module Q : sig
-  include module type of struct include Q end
+  include module type of struct
+    include Q
+  end
 
   val of_z : Z.t -> t
   val compare : t -> t -> int
@@ -115,7 +117,9 @@ module Q : sig
 end
 
 module Z : sig
-  include module type of struct include Z end
+  include module type of struct
+    include Z
+  end
 
   val compare : t -> t -> int
   val hash : t -> int
diff --git a/sledge/src/llair/exp.ml b/sledge/src/llair/exp.ml
index 11330cac0..f6beddce0 100644
--- a/sledge/src/llair/exp.ml
+++ b/sledge/src/llair/exp.ml
@@ -75,7 +75,12 @@ module T = struct
 end
 
 include T
-module Set = struct include Set.Make (T) include Provide_of_sexp (T) end
+
+module Set = struct
+  include Set.Make (T)
+  include Provide_of_sexp (T)
+end
+
 module Map = Map.Make (T)
 
 let pp_op2 fs op =
diff --git a/sledge/src/llair/llair.ml b/sledge/src/llair/llair.ml
index 2d5bec6a4..b13aac5e3 100644
--- a/sledge/src/llair/llair.ml
+++ b/sledge/src/llair/llair.ml
@@ -363,7 +363,10 @@ end
 (** Basic-Blocks *)
 
 module Block = struct
-  module T = struct type t = block [@@deriving compare, equal, sexp_of] end
+  module T = struct
+    type t = block [@@deriving compare, equal, sexp_of]
+  end
+
   include T
   module Map = Map.Make (T)
 
diff --git a/sledge/src/llair/reg.mli b/sledge/src/llair/reg.mli
index b5569d163..21ca817ca 100644
--- a/sledge/src/llair/reg.mli
+++ b/sledge/src/llair/reg.mli
@@ -7,4 +7,6 @@
 
 (** Variables *)
 
-include module type of struct include Exp.Reg end
+include module type of struct
+  include Exp.Reg
+end
diff --git a/sledge/src/term.ml b/sledge/src/term.ml
index fb02b7408..87beec20f 100644
--- a/sledge/src/term.ml
+++ b/sledge/src/term.ml
@@ -128,7 +128,11 @@ end = struct
 end
 
 include T
-module Map = struct include Map.Make (T) include Provide_of_sexp (T) end
+
+module Map = struct
+  include Map.Make (T)
+  include Provide_of_sexp (T)
+end
 
 let rec ppx strength fs term =
   let rec pp fs term =