[cleanup] simplify restoring packageheap

Summary: DRY

Reviewed By: nmote

Differential Revision: D20647159

fbshipit-source-id: b483cd6659c686c320f5b906749ef4ae6b7b30a5

src/services/inference/module/module_js.mli

@@ -104,7 +104,7 @@ val add_parsed_resolved_requires :
   File_key.t ->
   bool * Flow_error.ErrorSet.t
 
-val add_package : string -> Loc.t Package_json.t_or_error -> unit
+val add_package : string -> (Package_json.t, 'a) result -> unit
 
 type package_incompatible_reason =
   (* Didn't exist before, now it exists *)

src/services/inference/types_js.ml

@@ -2575,9 +2575,7 @@ let init_from_saved_state ~profiling ~workers ~saved_state ~updates options =
                                (Printf.sprintf
                                   "Saved state for `%s` missing Package_json.t data"
                                   str)
-                           | Some (Ok package) ->
-                             Module_heaps.Package_heap_mutator.add_package_json str package
-                           | Some (Error ()) -> Module_heaps.Package_heap_mutator.add_error str
+                           | Some package -> Module_js.add_package str package
                          end
                        | _ -> ()
                      end;