diff --git a/infer/src/backend/InferPrint.ml b/infer/src/backend/InferPrint.ml index 35cc68936..733d8318c 100644 --- a/infer/src/backend/InferPrint.ml +++ b/infer/src/backend/InferPrint.ml @@ -206,15 +206,6 @@ end let should_report (issue_kind: Exceptions.err_kind) issue_type error_desc eclass = if not Config.filtering || Exceptions.equal_err_class eclass Exceptions.Linters then true else - let analyzer_is_whitelisted = - match Config.analyzer with - | Eradicate - -> true - | BiAbduction | CaptureOnly | Checkers | CompileOnly | Crashcontext | Linters - -> false - in - if analyzer_is_whitelisted then true - else let issue_kind_is_blacklisted = match issue_kind with Kinfo -> true | Kerror | Kwarning | Kadvice | Klike -> false in diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml index 7ecaba70d..421ff1de0 100644 --- a/infer/src/base/Config.ml +++ b/infer/src/base/Config.ml @@ -21,7 +21,6 @@ type analyzer = | BiAbduction | CaptureOnly | CompileOnly - | Eradicate | Checkers | Crashcontext | Linters @@ -34,7 +33,6 @@ let string_to_analyzer = ; ("checkers", Checkers) ; ("compile", CompileOnly) ; ("crashcontext", Crashcontext) - ; ("eradicate", Eradicate) ; ("infer", BiAbduction) ; ("linters", Linters) ] @@ -559,7 +557,6 @@ and analyzer = BiAbduction | CaptureOnly | CompileOnly - | Eradicate | Checkers | Crashcontext | Linters @@ -1782,8 +1779,6 @@ let post_parsing_initialization command_opt = -> biabduction := true | Some Crashcontext -> crashcontext := true - | Some Eradicate - -> eradicate := true | Some (CaptureOnly | CompileOnly | Checkers | Linters) -> () | None diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli index cb8757521..9d7d1560d 100644 --- a/infer/src/base/Config.mli +++ b/infer/src/base/Config.mli @@ -18,7 +18,6 @@ type analyzer = | BiAbduction | CaptureOnly | CompileOnly - | Eradicate | Checkers | Crashcontext | Linters diff --git a/infer/src/integration/Buck.ml b/infer/src/integration/Buck.ml index 1fd63d1e1..7686266aa 100644 --- a/infer/src/integration/Buck.ml +++ b/infer/src/integration/Buck.ml @@ -52,7 +52,7 @@ let add_flavor_to_target target = -> add "infer-capture-all" | None, (BiAbduction | Checkers) -> add "infer" - | None, (Eradicate | Crashcontext) + | None, Crashcontext -> failwithf "Analyzer %s is Java-only; not supported with Buck flavors" (Config.string_of_analyzer Config.analyzer) diff --git a/infer/src/integration/Driver.ml b/infer/src/integration/Driver.ml index 6ffbe16cc..448e7bfb4 100644 --- a/infer/src/integration/Driver.ml +++ b/infer/src/integration/Driver.ml @@ -416,7 +416,7 @@ let analyze_and_report ~changed_files mode = (false, false) | _, (CaptureOnly | CompileOnly) -> (false, false) - | _, (BiAbduction | Checkers | Crashcontext | Eradicate) + | _, (BiAbduction | Checkers | Crashcontext) -> (true, true) | _, Linters -> (false, true) diff --git a/infer/tests/codetoanalyze/java/eradicate/Makefile b/infer/tests/codetoanalyze/java/eradicate/Makefile index 063184845..5c506652e 100644 --- a/infer/tests/codetoanalyze/java/eradicate/Makefile +++ b/infer/tests/codetoanalyze/java/eradicate/Makefile @@ -7,8 +7,8 @@ TESTS_DIR = ../../.. -ANALYZER = eradicate -INFER_OPTIONS = --eradicate-return-over-annotated --eradicate-optional-present --no-filtering --debug-exceptions +ANALYZER = checkers +INFER_OPTIONS = --no-default-checkers --eradicate --eradicate-return-over-annotated --eradicate-optional-present --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java)