fixed nix, formatted

Author: jvanburen

compiler/bin-js_of_ocaml/check_runtime.ml

@@ -63,15 +63,15 @@ let f (runtime_files, bytecode, target_env) =
   Linker.check_deps ();
   let all_prims =
     List.concat_map bytecode ~f:(fun f ->
-       (
         let ic = open_in_bin f in
         let prims =
-          Fun.protect (fun () ->
-          (* CR jvanburen: fix this once by reading .cmj files. *)
-          failwith "Unimplemented")
+          Fun.protect
+            (fun () ->
+              (* CR jvanburen: fix this once by reading .cmj files. *)
+              failwith "Unimplemented")
             ~finally:(fun () -> close_in ic)
         in
-        List.map ~f:(fun p -> p, f) prims))
+        List.map ~f:(fun p -> p, f) prims)
   in
   let _percent_prim, needed =
     List.partition all_prims ~f:(fun (x, _) -> Char.equal (String.get x 0) '%')

compiler/bin-js_of_ocaml/cmd_arg.ml

@@ -115,9 +115,7 @@ let options =
     Arg.(value & opt (some string) None & info [ "o" ] ~docv:"FILE" ~doc)
   in
   let input_file =
-    let doc =
-      "Compile the JSOO file (.cmj) or archive (.cmja) [$(docv)]."
-    in
+    let doc = "Compile the JSOO file (.cmj) or archive (.cmja) [$(docv)]." in
     Arg.(required & pos ~rev:true 0 (some string) None & info [] ~docv:"PROGRAM" ~doc)
   in
   let keep_unit_names =

compiler/bin-js_of_ocaml/compile.ml

@@ -205,8 +205,8 @@ let run
     if Option.is_some source_map && Parse_bytecode.Debug.is_empty one.debug
     then
       warn
-        "Warning: '--source-map' is enabled but the program was compiled with \
-         no debugging information.\n\
+        "Warning: '--source-map' is enabled but the program was compiled with no \
+         debugging information.\n\
          %!"
   in
   let pseudo_fs_instr prim debug cmis =
@@ -290,7 +290,7 @@ let run
     sm
   in
   let output_partial
-      ({name = _ ; info= uinfo ; contents }: Parse_bytecode.compilation_unit)
+      ({ name = _; info = uinfo; contents } : Parse_bytecode.compilation_unit)
       ~standalone
       ~source_map
       ((_, fmt) as output_file) =
@@ -364,81 +364,82 @@ let run
             ~link:`All
             output_file
           |> sourcemap_of_info ~base:source_map_base)
-  | `Filename filename ->
+  | `Filename filename -> (
       match
         Parse_bytecode.load
           ~filename
           ~include_dirs
           ~include_cmis
           ~debug:need_debug
-          ~log_times:(times())
+          ~log_times:(times ())
       with
       | `Cmj cmj ->
-        output_gen
-          ~standalone:false
-          ~custom_header
-          ~build_info:(Build_info.create `Cmj)
-          ~source_map
-          (fst output_file)
-          (fun ~standalone ~source_map output ->
-             if include_runtime then
-               (let sm1 = output_partial_runtime ~standalone ~source_map output in
-               let sm2 = output_partial cmj ~standalone ~source_map output in
-                sourcemap_of_infos ~base:source_map_base [sm1; sm2])
-             else
-               output_partial cmj ~standalone ~source_map output
-               |> sourcemap_of_info ~base:source_map_base)
+          output_gen
+            ~standalone:false
+            ~custom_header
+            ~build_info:(Build_info.create `Cmj)
+            ~source_map
+            (fst output_file)
+            (fun ~standalone ~source_map output ->
+              if include_runtime
+              then
+                let sm1 = output_partial_runtime ~standalone ~source_map output in
+                let sm2 = output_partial cmj ~standalone ~source_map output in
+                sourcemap_of_infos ~base:source_map_base [ sm1; sm2 ]
+              else
+                output_partial cmj ~standalone ~source_map output
+                |> sourcemap_of_info ~base:source_map_base)
       | `Cmja units ->
-      if keep_unit_names then (
-        let output_dir =
-            match output_file with
-            | `Stdout, false -> Filename.current_dir_name
-            | `Name x, false -> Filename.dirname x
-            | `Name x, true when String.ends_with x ~suffix:"/" -> x
-            | `Stdout, true | `Name _, true ->
-                failwith "use [-o dirname/] or remove [--keep-unit-names]"
-        in
-          if include_runtime then (
-            output_gen
-              ~standalone:false
-              ~custom_header
-              ~build_info:(Build_info.create `Runtime)
-              ~source_map
-              (`Name (Filename.concat output_dir "runtime.js"))
-              (fun ~standalone ~source_map output ->
-                 output_partial_runtime ~standalone ~source_map output
-                 |> sourcemap_of_info ~base:source_map_base));
-          List.iter units ~f:(fun (cmj : Parse_bytecode.compilation_unit) ->
+          if keep_unit_names
+          then (
+            let output_dir =
+              match output_file with
+              | `Stdout, false -> Filename.current_dir_name
+              | `Name x, false -> Filename.dirname x
+              | `Name x, true when String.ends_with x ~suffix:"/" -> x
+              | `Stdout, true | `Name _, true ->
+                  failwith "use [-o dirname/] or remove [--keep-unit-names]"
+            in
+            if include_runtime
+            then
+              output_gen
+                ~standalone:false
+                ~custom_header
+                ~build_info:(Build_info.create `Runtime)
+                ~source_map
+                (`Name (Filename.concat output_dir "runtime.js"))
+                (fun ~standalone ~source_map output ->
+                  output_partial_runtime ~standalone ~source_map output
+                  |> sourcemap_of_info ~base:source_map_base);
+            List.iter units ~f:(fun (cmj : Parse_bytecode.compilation_unit) ->
+                output_gen
+                  ~standalone:false
+                  ~custom_header
+                  ~build_info:(Build_info.create `Cmja)
+                  ~source_map
+                  (`Name (Filename.concat output_dir (cmj.name ^ ".js")))
+                  (fun ~standalone ~source_map output ->
+                    output_partial ~standalone ~source_map cmj output
+                    |> sourcemap_of_info ~base:source_map_base)))
+          else
             output_gen
               ~standalone:false
               ~custom_header
               ~build_info:(Build_info.create `Cmja)
               ~source_map
-              (`Name (Filename.concat output_dir (cmj.name ^ ".js")))
+              (fst output_file)
               (fun ~standalone ~source_map output ->
-                 output_partial ~standalone ~source_map cmj output
-                 |> sourcemap_of_info ~base:source_map_base))
-      ) else (
-        output_gen
-          ~standalone:false
-          ~custom_header
-          ~build_info:(Build_info.create `Cmja)
-          ~source_map
-          (fst output_file)
-          (fun ~standalone ~source_map output ->
-             let source_map_runtime =
-               if not include_runtime
-               then []
-               else [ output_partial_runtime ~standalone ~source_map output ]
-             in
-             let source_map_units =
-               List.map units ~f:(fun cmj ->
-                 output_partial cmj ~standalone ~source_map output)
-             in
-             let source_maps = source_map_runtime @ source_map_units in
-             sourcemap_of_infos ~base:source_map_base source_maps)
-      )
-  );
+                let source_map_runtime =
+                  if not include_runtime
+                  then []
+                  else [ output_partial_runtime ~standalone ~source_map output ]
+                in
+                let source_map_units =
+                  List.map units ~f:(fun cmj ->
+                      output_partial cmj ~standalone ~source_map output)
+                in
+                let source_maps = source_map_runtime @ source_map_units in
+                sourcemap_of_infos ~base:source_map_base source_maps)));
   Debug.stop_profiling ()
 
 let info name =

compiler/bin-js_of_ocaml/js_of_ocaml.ml

@@ -43,32 +43,30 @@ let () =
     | _ -> argv
   in
   try
-    (
-      match
-        Cmdliner.Cmd.eval_value
-          ~catch:false
-          ~argv
-          (Cmdliner.Cmd.group
-             ~default:Compile.term
-             (Compile.info "js_of_ocaml")
-             [ Link.command
-             ; Build_fs.command
-             ; Build_runtime.command
-             ; Print_runtime.command
-             ; Check_runtime.command
-             ; Compile.command
-             ])
-      with
-      | Ok (`Ok () | `Help | `Version) ->
-          if !warnings > 0 && !werror
-          then (
-            Format.eprintf "%s: all warnings being treated as errors@." Sys.argv.(0);
-            exit 1)
-          else exit 0
-      | Error `Term -> exit 1
-      | Error `Parse -> exit Cmdliner.Cmd.Exit.cli_error
-      | Error `Exn -> ()
-      (* should not happen *))
+    match
+      Cmdliner.Cmd.eval_value
+        ~catch:false
+        ~argv
+        (Cmdliner.Cmd.group
+           ~default:Compile.term
+           (Compile.info "js_of_ocaml")
+           [ Link.command
+           ; Build_fs.command
+           ; Build_runtime.command
+           ; Print_runtime.command
+           ; Check_runtime.command
+           ; Compile.command
+           ])
+    with
+    | Ok (`Ok () | `Help | `Version) ->
+        if !warnings > 0 && !werror
+        then (
+          Format.eprintf "%s: all warnings being treated as errors@." Sys.argv.(0);
+          exit 1)
+        else exit 0
+    | Error `Term -> exit 1
+    | Error `Parse -> exit Cmdliner.Cmd.Exit.cli_error
+    | Error `Exn -> () (* should not happen *)
   with
   | (Match_failure _ | Assert_failure _ | Not_found) as exc ->
       let backtrace = Printexc.get_backtrace () in
@@ -96,8 +94,8 @@ let () =
         else "a newer"
       in
       Format.eprintf
-        "%s: Error: Your JSIR file and the js_of_ocaml compiler have to be compiled \
-         for the same version of ocaml.@."
+        "%s: Error: Your JSIR file and the js_of_ocaml compiler have to be compiled for \
+         the same version of ocaml.@."
         Sys.argv.(0);
       Format.eprintf
         "%s: Error: Its seems that your ocaml bytecode has been compiled with %s version \

compiler/bin-jsoo_minify/jsoo_minify.ml

@@ -93,11 +93,10 @@ let main =
 
 let (_ : int) =
   try
-    (
-      Cmdliner.Cmd.eval
-        ~catch:false
-        ~argv:(Jsoo_cmdline.normalize_argv ~warn:(warn "%s") Sys.argv)
-        main)
+    Cmdliner.Cmd.eval
+      ~catch:false
+      ~argv:(Jsoo_cmdline.normalize_argv ~warn:(warn "%s") Sys.argv)
+      main
   with
   | (Match_failure _ | Assert_failure _ | Not_found) as exc ->
       let backtrace = Printexc.get_backtrace () in

compiler/lib-wasm/gc_target.ml

@@ -1076,12 +1076,10 @@ module Constant = struct
         let* e = Memory.make_int32 ~kind:`Nativeint (return (W.Const (I32 i))) in
         return (Const, e)
     | Null ->
-      let* var =
-        register_import
-          ~name:"null"
-          (Global { mut = false; typ = Type.value })
-      in
-      return (Const, W.GlobalGet var)
+        let* var =
+          register_import ~name:"null" (Global { mut = false; typ = Type.value })
+        in
+        return (Const, W.GlobalGet var)
 
   let translate c =
     let* const, c = translate_rec c in