[ocamlformat] upgrade ocamlformat to 0.8

jberdine · facebook-github-bot · commit e1d4aad487b2 · 2018-10-12T08:20:47.000-07:00
Reviewed By: mbouaziz

Differential Revision: D10359577

fbshipit-source-id: e7f5286e3
diff --git a/.ocamlformat b/.ocamlformat
@@ -1,3 +1,4 @@
+let-binding-spacing = sparse
 break-cases = nested
 margin = 100
-version = 0.7
+version = 0.8
diff --git a/.ocamlformat.hash b/.ocamlformat.hash
@@ -1 +1 @@
-b3ed72b3997cb7712e54f90d47128d6dd8e18f53
+e2cf2fd21fdc2f79840ddf994403a0c2469b6bfd
diff --git a/Makefile b/Makefile
@@ -684,7 +684,7 @@ endif
 # This is a magical version number that doesn't reinstall the world when added on top of what we
 # have in opam.lock. To upgrade this version number, manually try to install several utop versions
 # until you find one that doesn't recompile the world. TODO(t20828442): get rid of magic
-OPAM_DEV_DEPS = ocamlformat.$$(grep version .ocamlformat | cut -d ' ' -f 3) ocp-indent merlin utop.2.2.0 webbrowser
+OPAM_DEV_DEPS = ocp-indent merlin utop.2.2.0 webbrowser
 
 ifneq ($(EMACS),no)
 OPAM_DEV_DEPS += tuareg
@@ -697,6 +697,8 @@ devsetup: Makefile.autoconf
 	  OPAMSWITCH=$(OPAMSWITCH); $(OPAM) install --yes --no-checksum user-setup $(OPAM_DEV_DEPS))
 	$(QUIET)echo '$(TERM_INFO)*** Running `opam config setup -a`$(TERM_RESET)' >&2
 	$(QUIET)OPAMSWITCH=$(OPAMSWITCH); $(OPAM) config --yes setup -a
+	$(QUIET)$(call silent_on_success,installing ocamlformat,\
+	  OPAMSWITCH=$(OPAMSWITCH); $(OPAM) pin add --yes ocamlformat.$$(grep version .ocamlformat | cut -d ' ' -f 3) https://github.com/ocaml-ppx/ocamlformat.git#$$(grep version .ocamlformat | cut -d ' ' -f 3)-opam1)
 	$(QUIET)echo '$(TERM_INFO)*** Running `opam user-setup`$(TERM_RESET)' >&2
 	$(QUIET)OPAMSWITCH=$(OPAMSWITCH); OPAMYES=1; $(OPAM) user-setup install
 	$(QUIET)if [ "$(PLATFORM)" = "Darwin" ] && [ x"$(GNU_SED)" = x"no" ]; then \
diff --git a/infer/src/IR/HilExp.ml b/infer/src/IR/HilExp.ml
@@ -210,6 +210,7 @@ let rec eval_arithmetic_binop op e1 e2 =
   | _ ->
       None
 
+
 and eval = function
   | Constant c ->
       Some c
diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
@@ -1187,9 +1187,9 @@ and () =
        "Do not show reports coming from this type of issue. Each checker can report a range of \
         issue types. This option provides fine-grained filtering over which types of issue should \
         be reported once the checkers have run. In particular, note that disabling issue types \
-        does not make the corresponding checker not run.\n \
-        By default, the following issue types are disabled: %s.\n\n \
-        See also $(b,--report-issue-type).\n"
+        does not make the corresponding checker not run.\n\
+       \ By default, the following issue types are disabled: %s.\n\n\
+       \ See also $(b,--report-issue-type).\n"
        (String.concat ~sep:", " disabled_issues_ids)) ;
   mk true ~long:"enable-issue-type"
     ~deprecated:["enable_checks"; "-enable-checks"]
diff --git a/infer/src/base/Die.mli b/infer/src/base/Die.mli
@@ -7,9 +7,10 @@
 
 open! IStd
 
-(* WARNING: ONLY USE IF Logging IS NOT AVAILABLE TO YOU FOR SOME REASON (e.g., inside Config). *)
-
-exception InferExternalError of string
+exception
+  (* WARNING: ONLY USE IF Logging IS NOT AVAILABLE TO YOU FOR SOME REASON (e.g., inside Config). *)
+    InferExternalError of
+    string
 
 exception InferInternalError of string
 
diff --git a/infer/src/base/RunState.ml b/infer/src/base/RunState.ml
@@ -45,8 +45,8 @@ let load_and_validate () =
         Error
           (Printf.sprintf
              "'%s' already exists but it is not an empty directory and it does not look like an \
-              infer results directory:\n  \
-              %s\n\
+              infer results directory:\n\
+             \  %s\n\
               Was it created using an older version of infer?"
              Config.results_dir err_msg) )
       msg
diff --git a/infer/src/biabduction/Rearrange.mli b/infer/src/biabduction/Rearrange.mli
@@ -10,9 +10,8 @@ open! IStd
 
 (** Re-arrangement and extension of structures with fresh variables *)
 
-(* TODO: this description is not clear *)
-
-exception ARRAY_ACCESS
+exception (* TODO: this description is not clear *)
+            ARRAY_ACCESS
 
 val is_only_pt_by_fld_or_param_nonnull :
   Procdesc.t -> Tenv.t -> Prop.normal Prop.t -> Exp.t -> bool
diff --git a/infer/src/checkers/control.ml b/infer/src/checkers/control.ml
@@ -8,6 +8,7 @@
 open! IStd
 module F = Format
 module L = Logging
+
 (* forward dependency analysis for computing set of variables that
    affect the looping behavior of the program
 
diff --git a/infer/src/checkers/dominators.ml b/infer/src/checkers/dominators.ml
@@ -8,6 +8,7 @@ open! IStd
 open Graph
 module L = Logging
 module CFG = ProcCfg.Normal
+
 (* Use ocamlgraph's dominators functor to get the dominators *)
 module GDoms = Dominator.Make (ProcCfg.MakeOcamlGraph (CFG))
 
diff --git a/infer/src/checkers/uninitDomain.ml b/infer/src/checkers/uninitDomain.ml
@@ -148,5 +148,6 @@ module Summary = struct
     post = set of uninit local variables of the procedure *)
   type t = Domain.t prepost
 
-  let pp fmt {pre; post} = F.fprintf fmt "@\n Pre: %a @\nPost: %a @\n" Domain.pp pre Domain.pp post
+  let pp fmt {pre; post} =
+    F.fprintf fmt "@\n Pre: %a @\nPost: %a @\n" Domain.pp pre Domain.pp post
 end
diff --git a/infer/src/clang/Capture.ml b/infer/src/clang/Capture.ml
@@ -160,7 +160,8 @@ let cc1_capture clang_cmd =
   else if
     Config.skip_analysis_in_path_skips_compilation && CLocation.is_file_blacklisted source_path
   then (
-    L.(debug Capture Quiet) "@\n Skip compilation and analysis of source file %s@\n@\n" source_path ;
+    L.(debug Capture Quiet)
+      "@\n Skip compilation and analysis of source file %s@\n@\n" source_path ;
     () )
   else
     match Config.clang_biniou_file with
diff --git a/infer/src/clang/ClangWrapper.ml b/infer/src/clang/ClangWrapper.ml
@@ -180,7 +180,7 @@ let exe ~prog ~args =
            files. *)
       L.(debug Capture Quiet)
         "WARNING: `clang -### <args>` returned an empty set of commands to run and no error. Will \
-         run the original command directly:@\n  \
-         %s@\n"
+         run the original command directly:@\n\
+        \  %s@\n"
         (String.concat ~sep:" " @@ (prog :: args)) ;
     Process.create_process_and_wait ~prog ~args )
diff --git a/infer/src/clang/cTL.ml b/infer/src/clang/cTL.ml
@@ -1165,6 +1165,7 @@ let rec eval_Atomic pred_name_ args an lcxt =
   | _ ->
       L.(die ExternalError) "Undefined Predicate or wrong set of arguments: '%s'" pred_name
 
+
 and eval_AND an lcxt f1 f2 =
   match eval_formula f1 an lcxt with
   | Some witness1 -> (
@@ -1176,13 +1177,15 @@ and eval_AND an lcxt f1 f2 =
   | None (* we short-circuit the AND evaluation *) ->
       None
 
+
 and eval_OR an lcxt f1 f2 = choose_witness_opt (eval_formula f1 an lcxt) (eval_formula f2 an lcxt)
 
 and eval_Implies an lcxt f1 f2 =
   let witness1 = if Option.is_some (eval_formula f1 an lcxt) then None else Some an in
   let witness2 = eval_formula f2 an lcxt in
   choose_witness_opt witness1 witness2
 
+
 (* an, lcxt |= EF phi  <=>
    an, lcxt |= phi or exists an' in Successors(st): an', lcxt |= EF phi
 
@@ -1203,6 +1206,7 @@ and eval_EF phi an lcxt trans =
         List.fold_left (Ctl_parser_types.get_direct_successor_nodes an) ~init:witness_opt
           ~f:(fun acc node -> choose_witness_opt (eval_EF phi node lcxt trans) acc )
 
+
 (* an, lcxt |= EX phi  <=> exists an' in Successors(st): an', lcxt |= phi
 
    That is: a (an, lcxt) satifies EX phi if and only if
@@ -1227,6 +1231,7 @@ and eval_EX phi an lcxt trans =
   | _ ->
       witness_opt
 
+
 (* an, lcxt |= E(phi1 U phi2) evaluated using the equivalence
    an, lcxt |= E(phi1 U phi2) <=> an, lcxt |= phi2 or (phi1 and EX(E(phi1 U phi2)))
 
@@ -1237,6 +1242,7 @@ and eval_EU phi1 phi2 an lcxt trans =
   let f = Or (phi2, And (phi1, EX (trans, EU (trans, phi1, phi2)))) in
   eval_formula f an lcxt
 
+
 (* an |= A(phi1 U phi2) evaluated using the equivalence
    an |= A(phi1 U phi2) <=> an |= phi2 or (phi1 and AX(A(phi1 U phi2)))
 
@@ -1246,6 +1252,7 @@ and eval_AU phi1 phi2 an lcxt trans =
   let f = Or (phi2, And (phi1, AX (trans, AU (trans, phi1, phi2)))) in
   eval_formula f an lcxt
 
+
 (* an, lcxt |= InNode[node_type_list] phi <=>
    an is a node of type in node_type_list and an satifies phi
 *)
@@ -1263,6 +1270,7 @@ and in_node node_type_list phi an lctx =
   List.fold_left node_type_list ~init:None ~f:(fun acc node ->
       choose_witness_opt (holds_for_one_node node) acc )
 
+
 (* Intuitive meaning: (an,lcxt) satifies EH[Classes] phi
    if the node an is among the declaration specified by the list Classes and
    there exists a super class in its hierarchy whose declaration satisfy phi.
@@ -1275,6 +1283,7 @@ and eval_EH classes phi an lcxt =
   let f = ET (classes, None, EX (Some Super, EF (Some Super, phi))) in
   eval_formula f an lcxt
 
+
 (* an, lcxt |= ET[T][->l]phi <=>
    eventually we reach a node an' such that an' is among the types defined in T
    and:
@@ -1295,6 +1304,7 @@ and eval_ET tl trs phi an lcxt =
   in
   eval_formula f an lcxt
 
+
 (* Formulas are evaluated on a AST node an and a linter context lcxt *)
 and eval_formula f an lcxt : Ctl_parser_types.ast_node option =
   debug_eval_begin (debug_create_payload an f lcxt) ;
diff --git a/infer/src/clang/cType_to_sil_type.ml b/infer/src/clang/cType_to_sil_type.ml
@@ -98,6 +98,7 @@ let rec build_array_type translate_decl tenv (qual_type : Clang_ast_t.qual_type)
   let stride = Option.map ~f:IntLit.of_int stride_opt in
   Typ.Tarray {elt= array_type; length; stride}
 
+
 and type_desc_of_attr_type translate_decl tenv type_info attr_info =
   match type_info.Clang_ast_t.ti_desugared_type with
   | Some type_ptr -> (
@@ -110,6 +111,7 @@ and type_desc_of_attr_type translate_decl tenv type_info attr_info =
   | None ->
       Typ.Tvoid
 
+
 and type_desc_of_c_type translate_decl tenv c_type : Typ.desc =
   let open Clang_ast_t in
   match c_type with
@@ -167,6 +169,7 @@ and type_desc_of_c_type translate_decl tenv c_type : Typ.desc =
       | None ->
           Typ.Tvoid )
 
+
 and decl_ptr_to_type_desc translate_decl tenv decl_ptr : Typ.desc =
   let open Clang_ast_t in
   let typ = Clang_ast_extend.DeclPtr decl_ptr in
@@ -194,6 +197,7 @@ and decl_ptr_to_type_desc translate_decl tenv decl_ptr : Typ.desc =
           (Clang_ast_j.string_of_pointer decl_ptr) ;
         Typ.Tvoid )
 
+
 and clang_type_ptr_to_type_desc translate_decl tenv type_ptr =
   try Clang_ast_extend.TypePointerMap.find type_ptr !CFrontend_config.sil_types_map
   with Caml.Not_found -> (
@@ -205,6 +209,7 @@ and clang_type_ptr_to_type_desc translate_decl tenv type_ptr =
     | _ ->
         Typ.Tvoid )
 
+
 and type_ptr_to_type_desc translate_decl tenv type_ptr : Typ.desc =
   match type_ptr with
   | Clang_ast_types.TypePtr.Ptr _ ->
@@ -226,6 +231,7 @@ and type_ptr_to_type_desc translate_decl tenv type_ptr : Typ.desc =
   | _ ->
       L.(die InternalError) "unknown variant for type_ptr"
 
+
 and qual_type_to_sil_type translate_decl tenv qual_type =
   let desc = type_ptr_to_type_desc translate_decl tenv qual_type.Clang_ast_t.qt_type_ptr in
   let quals = Typ.mk_type_quals ~is_const:qual_type.Clang_ast_t.qt_is_const () in
diff --git a/infer/src/clang/clang_ast_extend.ml b/infer/src/clang/clang_ast_extend.ml
@@ -6,6 +6,7 @@
  *)
 
 open! IStd
+
 (* This module adds more variants to some types in AST The implementation extends default one from
    the facebook-clang-plugins repository *)
 
@@ -88,6 +89,7 @@ module TypePointerOrd = struct
         L.(die InternalError)
           "unexpected type_ptr variants: %s, %s" (type_ptr_to_string t1) (type_ptr_to_string t2)
 
+
   and compare_qual_type (qt1 : Clang_ast_t.qual_type) (qt2 : Clang_ast_t.qual_type) =
     if phys_equal qt1 qt2 then 0
     else
diff --git a/infer/src/clang/tableaux.ml b/infer/src/clang/tableaux.ml
@@ -254,10 +254,10 @@ let add_valid_formulae an checker lcxt cl =
         add_in_set phi acc_set
     | AG _ | AX _ | AF _ | AU _ | EH _ | ET _ | Implies _ ->
         Logging.die InternalError
-          "@\n \
-           We should not have operators AG, AX, AF, AU, EH, ET.\n  \
-           Failing with formula @\n   \
-           %a@\n"
+          "@\n\
+          \ We should not have operators AG, AX, AF, AU, EH, ET.\n\
+          \  Failing with formula @\n\
+          \   %a@\n"
           CTL.Debug.pp_formula phi
     | _ ->
         acc_set
diff --git a/infer/src/concurrency/RacerD.ml b/infer/src/concurrency/RacerD.ml
@@ -742,7 +742,8 @@ let get_reporting_explanation_java report_kind tenv pname thread =
     if is_thread_safe_method pname tenv then
       Some
         (F.asprintf
-           "@\n Reporting because current method is annotated %a or overrides an annotated method."
+           "@\n\
+           \ Reporting because current method is annotated %a or overrides an annotated method."
            MF.pp_monospaced "@ThreadSafe")
     else
       match FbThreadSafety.get_fbthreadsafe_class_annot pname tenv with
@@ -788,8 +789,8 @@ let get_reporting_explanation_java report_kind tenv pname thread =
       else
         ( IssueType.thread_safety_violation
         , F.asprintf
-            "@\n \
-             Reporting because another access to the same memory occurs on a background thread, \
+            "@\n\
+            \ Reporting because another access to the same memory occurs on a background thread, \
              although this access may not." )
 
 
diff --git a/infer/src/concurrency/RacerDDomain.ml b/infer/src/concurrency/RacerDDomain.ml
@@ -698,8 +698,8 @@ let pp_summary fmt {threads; locks; accesses; return_ownership; return_attribute
 let pp fmt {threads; locks; accesses; ownership; attribute_map; wobbly_paths} =
   F.fprintf fmt
     "Threads: %a, Locks: %a @\n\
-     Accesses %a @\n \
-     Ownership: %a @\n\
+     Accesses %a @\n\
+    \ Ownership: %a @\n\
      Attributes: %a @\n\
      Non-stable Paths: %a@\n"
     ThreadsDomain.pp threads LocksDomain.pp locks AccessDomain.pp accesses OwnershipDomain.pp
diff --git a/infer/src/unit/TaintTests.ml b/infer/src/unit/TaintTests.ml
@@ -137,9 +137,9 @@ let tests =
         ; read_field_to_id "read_id" "base_id" "f"
         ; var_assign_id "var" "read_id"
         ; invariant
-            "{ base_id$0.f* => (SOURCE -> ?),\n  \
-             ret_id$0* => (SOURCE -> ?),\n  \
-             var* => (SOURCE -> ?) }" ] )
+            "{ base_id$0.f* => (SOURCE -> ?),\n\
+            \  ret_id$0* => (SOURCE -> ?),\n\
+            \  var* => (SOURCE -> ?) }" ] )
     ; ( "source flows to var then cleared"
       , [ assign_to_source "ret_id"
         ; var_assign_id "var" "ret_id"
diff --git a/sledge/src/config.ml b/sledge/src/config.ml
@@ -39,6 +39,7 @@ end = struct
     let (Arg (trm, set)) = List.fold_right ~f:pair args ~init in
     Term.app (Term.const set) trm
 
+
   let args : arg list ref = ref []
 
   let mk ~default arg =
@@ -47,6 +48,7 @@ end = struct
     args := Arg (arg, set) :: !args ;
     var
 
+
   let parse info validate =
     match Term.eval (Term.(ret (const validate $ tuple !args)), info) with
     | `Ok () -> ()
@@ -60,14 +62,17 @@ let input =
   mk ~default:""
     Arg.(required & pos ~rev:true 0 (some string) None & info [])
 
+
 let output =
   let default = None in
   mk ~default Arg.(value & opt (some string) default & info ["o"; "output"])
 
+
 let trace_all =
   let default = false in
   mk ~default Arg.(value & flag & info ["t"; "trace-all"])
 
+
 let info = Term.info "sledge" ~version:Version.version
 
 let validate () = `Ok ()
diff --git a/sledge/src/import/import.ml b/sledge/src/import/import.ml
diff --git a/sledge/src/llair/exp.ml b/sledge/src/llair/exp.ml
diff --git a/sledge/src/llair/frontend.ml b/sledge/src/llair/frontend.ml
diff --git a/sledge/src/llair/llair.ml b/sledge/src/llair/llair.ml
diff --git a/sledge/src/llair/loc.ml b/sledge/src/llair/loc.ml
diff --git a/sledge/src/llair/typ.ml b/sledge/src/llair/typ.ml
diff --git a/sledge/src/ppx_trace/ppx_trace.ml b/sledge/src/ppx_trace/ppx_trace.ml
diff --git a/sledge/src/sledge.ml b/sledge/src/sledge.ml
diff --git a/sledge/src/trace/trace.ml b/sledge/src/trace/trace.ml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b3ed72b3997cb7712e54f90d47128d6dd8e18f53`
	`1`	`+e2cf2fd21fdc2f79840ddf994403a0c2469b6bfd`