[buck] further remove dead arguments and code

Summary: Argument `filter_kind` is only ever set to `Auto` by the clang integration.

Reviewed By: jvillard

Differential Revision: D21685943

fbshipit-source-id: ebeb04409

infer/src/integration/Buck.ml

@@ -312,7 +312,7 @@ let inline_argument_files buck_args =
   List.concat_map ~f:expand_buck_arg buck_args
 
 
-let parse_command_and_targets (buck_mode : BuckMode.t) ~filter_kind original_buck_args =
+let parse_command_and_targets (buck_mode : BuckMode.t) original_buck_args =
   let expanded_buck_args = inline_argument_files original_buck_args in
   let command, args = split_buck_command expanded_buck_args in
   let buck_targets_blacklist_regexp =
@@ -344,12 +344,11 @@ let parse_command_and_targets (buck_mode : BuckMode.t) ~filter_kind original_buc
   in
   let parsed_args = parse_cmd_args empty_parsed_args args in
   let targets =
-    match (filter_kind, buck_mode, parsed_args) with
+    match (buck_mode, parsed_args) with
-    | ( `Auto
+    | ClangFlavors, {pattern_targets= []; alias_targets= []; normal_targets} ->
-      , (ClangFlavors | JavaGenruleMaster | CombinedGenrule)
-      , {pattern_targets= []; alias_targets= []; normal_targets} ) ->
         normal_targets
-    | (`Yes | `Auto), _, {pattern_targets; alias_targets; normal_targets} ->
+    | ( (ClangFlavors | CombinedGenrule | JavaGenruleMaster | ClangCompilationDB _)
+      , {pattern_targets; alias_targets; normal_targets} ) ->
         pattern_targets |> List.rev_append alias_targets |> List.rev_append normal_targets
         |> resolve_pattern_targets buck_mode
   in

infer/src/integration/Buck.mli

@@ -34,8 +34,7 @@ val config : BuckMode.t -> string list
     ["--config" :: param_a :: "--config" :: param_b :: ...] describing the buck config flags for the
     given Buck mode. *)
 
-val parse_command_and_targets :
+val parse_command_and_targets : BuckMode.t -> string list -> string * string list * string list
-  BuckMode.t -> filter_kind:[< `Yes | `Auto] -> string list -> string * string list * string list
 (** parses given buck command, using the buck configuration returned by [config] above and returns a
     triple [(buck_command, non_target_params, target_params)] *)
 

infer/src/integration/BuckFlavors.ml

@@ -11,9 +11,9 @@ module F = Format
 
 type flavored_arguments = {command: string; rev_not_targets: string list; targets: string list}
 
-let add_flavors_to_buck_arguments buck_mode ~filter_kind ~extra_flavors original_buck_args =
+let add_flavors_to_buck_arguments buck_mode ~extra_flavors original_buck_args =
   let command, rev_not_targets, targets =
-    Buck.parse_command_and_targets buck_mode ~filter_kind original_buck_args
+    Buck.parse_command_and_targets buck_mode original_buck_args
   in
   let targets =
     List.rev_map targets ~f:(fun t ->
@@ -109,7 +109,7 @@ let capture build_cmd =
   in
   Unix.putenv ~key:CLOpt.args_env_var ~data:infer_args_with_buck ;
   let {command; rev_not_targets; targets} =
-    add_flavors_to_buck_arguments ClangFlavors ~filter_kind:`Auto ~extra_flavors:[] buck_args
+    add_flavors_to_buck_arguments ClangFlavors ~extra_flavors:[] buck_args
   in
   if List.is_empty targets then ()
   else

infer/src/integration/BuckFlavors.mli

@@ -10,14 +10,10 @@ open! IStd
 type flavored_arguments = {command: string; rev_not_targets: string list; targets: string list}
 
 val add_flavors_to_buck_arguments :
-     BuckMode.t
+  BuckMode.t -> extra_flavors:string list -> string list -> flavored_arguments
-  -> filter_kind:[< `Yes | `Auto]
-  -> extra_flavors:string list
-  -> string list
-  -> flavored_arguments
 (** Add infer flavors to the targets in the given buck arguments, depending on the infer analyzer.
-    For instance, in capture mode, the buck command: build //foo/bar:baz#some,flavor becomes: build
+    For instance, in clang capture mode, the buck command: build //foo/bar:baz#some,flavor becomes:
-    //foo/bar:baz#infer-capture-all,some,flavor *)
+    build //foo/bar:baz#infer-capture-all,some,flavor *)
 
 val capture : string list -> unit
 (** do a buck/clang flavor capture given the prog and build command (buck args) *)

infer/src/integration/BuckGenrule.ml

@@ -158,9 +158,7 @@ let capture buck_mode build_cmd =
   let prog, buck_cmd = (List.hd_exn build_cmd, List.tl_exn build_cmd) in
   L.progress "Querying buck for genrule capture targets...@." ;
   let time0 = Mtime_clock.counter () in
-  let command, args, targets =
+  let command, args, targets = Buck.parse_command_and_targets buck_mode buck_cmd in
-    Buck.parse_command_and_targets buck_mode ~filter_kind:`Yes buck_cmd
-  in
   L.progress "Found %d genrule capture targets in %a.@." (List.length targets) Mtime.Span.pp
     (Mtime_clock.count time0) ;
   let all_args = List.rev_append args targets in

infer/src/integration/CaptureCompilationDatabase.ml

@@ -70,7 +70,7 @@ let run_compilation_database compilation_database should_capture_file =
 (** Computes the compilation database files. *)
 let get_compilation_database_files_buck db_deps ~prog ~args =
   match
-    BuckFlavors.add_flavors_to_buck_arguments (ClangCompilationDB db_deps) ~filter_kind:`Yes
+    BuckFlavors.add_flavors_to_buck_arguments (ClangCompilationDB db_deps)
       ~extra_flavors:Config.append_buck_flavors args
   with
   | {targets} when List.is_empty targets ->