diff --git a/infer/man/man1/infer-analyze.txt b/infer/man/man1/infer-analyze.txt index a2b57db4c..bf1e3cc03 100644 --- a/infer/man/man1/infer-analyze.txt +++ b/infer/man/man1/infer-analyze.txt @@ -314,14 +314,6 @@ OPTIONS Activates: Enable --starvation and disable all other checkers (Conversely: --no-starvation-only) - --suggest-nullable - Activates: Nullable annotation sugesstions analysis (Conversely: - --no-suggest-nullable) - - --suggest-nullable-only - Activates: Enable --suggest-nullable and disable all other - checkers (Conversely: --no-suggest-nullable-only) - --no-uninit Deactivates: checker for use of uninitialized values (Conversely: --uninit) diff --git a/infer/man/man1/infer-full.txt b/infer/man/man1/infer-full.txt index abcbad7f4..d387ac0c3 100644 --- a/infer/man/man1/infer-full.txt +++ b/infer/man/man1/infer-full.txt @@ -869,14 +869,6 @@ OPTIONS Activates: Enable --starvation and disable all other checkers (Conversely: --no-starvation-only) See also infer-analyze(1). - --suggest-nullable - Activates: Nullable annotation sugesstions analysis (Conversely: - --no-suggest-nullable) See also infer-analyze(1). - - --suggest-nullable-only - Activates: Enable --suggest-nullable and disable all other - checkers (Conversely: --no-suggest-nullable-only) See also infer-analyze(1). - --threadsafe-aliases json Specify custom annotations that should be considered aliases of @ThreadSafe (default: []) See also infer-analyze(1). diff --git a/infer/man/man1/infer.txt b/infer/man/man1/infer.txt index e5804bdac..b15b0609a 100644 --- a/infer/man/man1/infer.txt +++ b/infer/man/man1/infer.txt @@ -869,14 +869,6 @@ OPTIONS Activates: Enable --starvation and disable all other checkers (Conversely: --no-starvation-only) See also infer-analyze(1). - --suggest-nullable - Activates: Nullable annotation sugesstions analysis (Conversely: - --no-suggest-nullable) See also infer-analyze(1). - - --suggest-nullable-only - Activates: Enable --suggest-nullable and disable all other - checkers (Conversely: --no-suggest-nullable-only) See also infer-analyze(1). - --threadsafe-aliases json Specify custom annotations that should be considered aliases of @ThreadSafe (default: []) See also infer-analyze(1). diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml index a9ac0b849..fefd6afb5 100644 --- a/infer/src/base/Config.ml +++ b/infer/src/base/Config.ml @@ -609,7 +609,6 @@ and ( annotation_reachability , resource_leak , siof , starvation - , suggest_nullable , uninit ) = let mk_checker ?(default = false) ?(deprecated = []) ~long doc = let var = @@ -650,7 +649,8 @@ and ( annotation_reachability mk_checker ~long:"liveness" ~default:true "the detection of dead stores and unused variables" and loop_hoisting = mk_checker ~long:"loop-hoisting" ~default:false "checker for loop-hoisting" and nullsafe = - mk_checker ~long:"nullsafe" ~deprecated:["-check-nullable"] + mk_checker ~long:"nullsafe" + ~deprecated:["-check-nullable"; "-suggest-nullable"] "[EXPERIMENTAL] Nullable type checker (incomplete: use --eradicate for now)" and ownership = mk_checker ~long:"ownership" ~default:true "the detection of C++ lifetime bugs" and printf_args = @@ -672,8 +672,6 @@ and ( annotation_reachability mk_checker ~long:"siof" ~default:true "the Static Initialization Order Fiasco analysis (C++ only)" and starvation = mk_checker ~long:"starvation" ~default:false "starvation analysis" - and suggest_nullable = - mk_checker ~long:"suggest-nullable" ~default:false "Nullable annotation sugesstions analysis" and uninit = mk_checker ~long:"uninit" "checker for use of uninitialized values" ~default:true in let mk_only (var, long, doc, _) = let _ : bool ref = @@ -736,7 +734,6 @@ and ( annotation_reachability , resource_leak , siof , starvation - , suggest_nullable , uninit ) @@ -2779,8 +2776,6 @@ and nelseg = !nelseg and nullable_annotation = !nullable_annotation -and suggest_nullable = !suggest_nullable - and no_translate_libs = not !headers and only_cheap_debug = !only_cheap_debug diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli index 376ea3822..67c34e95f 100644 --- a/infer/src/base/Config.mli +++ b/infer/src/base/Config.mli @@ -645,8 +645,6 @@ val stats_report : string option val subtype_multirange : bool -val suggest_nullable : bool - val symops_per_iteration : int option val test_determinator : bool diff --git a/infer/src/checkers/registerCheckers.ml b/infer/src/checkers/registerCheckers.ml index 89eb50767..b12bb9545 100644 --- a/infer/src/checkers/registerCheckers.ml +++ b/infer/src/checkers/registerCheckers.ml @@ -70,7 +70,7 @@ let all_checkers = ; active= Config.printf_args ; callbacks= [(Procedure PrintfArgs.callback_printf_args, Language.Java)] } ; { name= "nullable suggestion" - ; active= Config.suggest_nullable + ; active= Config.nullsafe ; callbacks= [ (Procedure NullabilitySuggest.checker, Language.Java) ; (Procedure NullabilitySuggest.checker, Language.Clang) ] } diff --git a/infer/tests/codetoanalyze/cpp/nullable/Makefile b/infer/tests/codetoanalyze/cpp/nullable/Makefile index 22fb96c92..8ef5bf9a5 100644 --- a/infer/tests/codetoanalyze/cpp/nullable/Makefile +++ b/infer/tests/codetoanalyze/cpp/nullable/Makefile @@ -7,7 +7,7 @@ TESTS_DIR = ../../.. # see explanations in cpp/errors/Makefile for the custom isystem CLANG_OPTIONS = -x c++ -std=c++11 -nostdinc++ -isystem$(ROOT_DIR) -isystem$(CLANG_INCLUDES)/c++/v1/ -c -INFER_OPTIONS = --biabduction --suggest-nullable --nullsafe --debug-exceptions --project-root $(TESTS_DIR) +INFER_OPTIONS = --biabduction --nullsafe --debug-exceptions --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.cpp) diff --git a/infer/tests/codetoanalyze/java/checkers/Makefile b/infer/tests/codetoanalyze/java/checkers/Makefile index 9d556a0f3..6f29437a1 100644 --- a/infer/tests/codetoanalyze/java/checkers/Makefile +++ b/infer/tests/codetoanalyze/java/checkers/Makefile @@ -8,7 +8,7 @@ TESTS_DIR = ../../.. INFER_OPTIONS = \ --debug-exceptions --no-default-checkers \ --annotation-reachability --fragment-retains-view --immutable-cast --printf-args --quandary \ - --suggest-nullable --nullsafe --racerd \ + --nullsafe --racerd \ INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) $(wildcard $(TESTS_DIR)/external/library/*.java) diff --git a/infer/tests/codetoanalyze/objc/nullable/Makefile b/infer/tests/codetoanalyze/objc/nullable/Makefile index 8a7f287c0..1f3449d01 100644 --- a/infer/tests/codetoanalyze/objc/nullable/Makefile +++ b/infer/tests/codetoanalyze/objc/nullable/Makefile @@ -6,7 +6,7 @@ TESTS_DIR = ../../.. CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) -INFER_OPTIONS = --debug-exceptions --no-default-checkers --suggest-nullable --nullsafe --project-root $(TESTS_DIR) +INFER_OPTIONS = --debug-exceptions --no-default-checkers --nullsafe --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.m) diff --git a/infer/tests/codetoanalyze/objcpp/nullable/Makefile b/infer/tests/codetoanalyze/objcpp/nullable/Makefile index fa23bf825..04a4d2888 100644 --- a/infer/tests/codetoanalyze/objcpp/nullable/Makefile +++ b/infer/tests/codetoanalyze/objcpp/nullable/Makefile @@ -6,7 +6,7 @@ TESTS_DIR = ../../.. CLANG_OPTIONS = -c $(OBJCPP_CLANG_OPTIONS) -INFER_OPTIONS = --debug-exceptions --no-default-checkers --suggest-nullable --nullsafe --project-root $(TESTS_DIR) +INFER_OPTIONS = --debug-exceptions --no-default-checkers --nullsafe --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.mm)