Break Service.Infer.infer into two pieces

Reviewed By: dkgi

Differential Revision: D30196049

fbshipit-source-id: 0d8f25743acb1c7df07c90325148ba41e0745141

Author: grievejia

source/command/inferCommand.ml

@@ -230,7 +230,10 @@ let run_infer_local
     (fun () ->
       let result =
         Scheduler.with_scheduler ~configuration ~f:(fun scheduler ->
-            Infer.infer ~configuration ~scheduler ())
+            let environment_data =
+              Service.Infer.build_environment_data ~configuration ~scheduler ()
+            in
+            Infer.run_infer ~configuration ~scheduler environment_data)
       in
       if debug then
         Memory.report_statistics ();

source/command/newInferCommand.ml

@@ -209,7 +209,8 @@ end
 let run_infer_local ~configuration () =
   let result =
     Scheduler.with_scheduler ~configuration ~f:(fun scheduler ->
-        Service.Infer.infer ~configuration ~scheduler ())
+        let environment_data = Service.Infer.build_environment_data ~configuration ~scheduler () in
+        Service.Infer.run_infer ~configuration ~scheduler environment_data)
   in
   if configuration.debug then
     Memory.report_statistics ();

source/service/infer.ml

@@ -10,10 +10,7 @@ open Analysis
 open Pyre
 
 type environment_data = {
-  module_tracker: ModuleTracker.t;
-  ast_environment: AstEnvironment.t;
   global_environment: AnnotatedGlobalEnvironment.ReadOnly.t;
-  global_resolution: GlobalResolution.t;
   qualifiers: Ast.Reference.t list;
 }
 
@@ -61,13 +58,13 @@ let build_environment_data
     in
     global_environment, qualifiers
   in
-  let global_resolution = GlobalResolution.create global_environment in
-  { module_tracker; ast_environment; global_environment; global_resolution; qualifiers }
+  { global_environment; qualifiers }
 
 
-let run_infer ~scheduler ~configuration ~global_resolution qualifiers =
+let run_infer ~configuration ~scheduler { global_environment; qualifiers } =
   Log.info "Running inference...";
   let timer = Timer.start () in
+  let global_resolution = GlobalResolution.create global_environment in
   let ast_environment = GlobalResolution.ast_environment global_resolution in
   let map _ qualifiers =
     let analyze_qualifier qualifier =
@@ -90,10 +87,4 @@ let run_infer ~scheduler ~configuration ~global_resolution qualifiers =
       ()
   in
   Statistics.performance ~name:"inference" ~phase_name:"Type inference" ~timer ();
-  results
-
-
-let infer ~configuration ~scheduler () =
-  let { global_resolution; qualifiers; _ } = build_environment_data ~configuration ~scheduler () in
-  run_infer ~scheduler ~configuration ~global_resolution qualifiers
-  |> TypeInference.Data.GlobalResult.from_local_results ~global_resolution
+  TypeInference.Data.GlobalResult.from_local_results ~global_resolution results

source/service/infer.mli

@@ -5,8 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-val infer
+type environment_data = {
+  global_environment: Analysis.AnnotatedGlobalEnvironment.ReadOnly.t;
+  qualifiers: Ast.Reference.t list;
+}
+
+val build_environment_data
   :  configuration:Configuration.Analysis.t ->
   scheduler:Scheduler.t ->
   unit ->
+  environment_data
+
+val run_infer
+  :  configuration:Configuration.Analysis.t ->
+  scheduler:Scheduler.t ->
+  environment_data ->
   TypeInference.Data.GlobalResult.t