From 8461786f02d28bbab035403cbc4a992b89e5b13f Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Tue, 19 Jun 2018 05:12:53 -0700
Subject: [PATCH] [cli] remove support for deprecated `infer -- analyze`

Summary: It's been deprecated for a while now. Use `infer analyze` instead.

Reviewed By: dulmarod

Differential Revision: D8442682

fbshipit-source-id: 0b8c590
---
 infer/src/base/Config.ml        | 4 +---
 infer/src/base/Config.mli       | 1 -
 infer/src/integration/Driver.ml | 7 -------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index 77906d1e9..d9bdd59d0 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -80,7 +80,6 @@ type compilation_database_dependencies =
 [@@deriving compare]
 
 type build_system =
-  | BAnalyze
   | BAnt
   | BBuck
   | BClang
@@ -100,8 +99,7 @@ let equal_build_system = [%compare.equal : build_system]
    system. In that case, the first one in the list will be used for printing, eg, in which mode
    infer is running. *)
 let build_system_exe_assoc =
-  [ (BAnalyze, "analyze")
-  ; (BAnt, "ant")
+  [ (BAnt, "ant")
   ; (BBuck, "buck")
   ; (BGradle, "gradle")
   ; (BGradle, "gradlew")
diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli
index 0ec20d251..3b9a8d011 100644
--- a/infer/src/base/Config.mli
+++ b/infer/src/base/Config.mli
@@ -31,7 +31,6 @@ type compilation_database_dependencies =
 [@@deriving compare]
 
 type build_system =
-  | BAnalyze
   | BAnt
   | BBuck
   | BClang
diff --git a/infer/src/integration/Driver.ml b/infer/src/integration/Driver.ml
index a896c0f5c..fc164ed96 100644
--- a/infer/src/integration/Driver.ml
+++ b/infer/src/integration/Driver.ml
@@ -448,8 +448,6 @@ let assert_supported_build_system build_system =
           (`Java, Config.string_of_build_system build_system) )
       in
       assert_supported_mode analyzer build_string
-  | BAnalyze ->
-      ()
 
 
 let mode_of_build_command build_cmd =
@@ -469,11 +467,6 @@ let mode_of_build_command build_cmd =
       in
       assert_supported_build_system build_system ;
       match (build_system : Config.build_system) with
-      | BAnalyze ->
-          CLOpt.warnf
-            "WARNING: `infer -- analyze` is deprecated; use the `infer analyze` subcommand \
-             instead@." ;
-          Analyze
       | BBuck when Option.is_some Config.buck_compilation_database ->
           BuckCompilationDB (prog, List.append args (List.rev Config.buck_build_args))
       | BClang ->