fixup! Add options for silencing warnings for behaviours

Author: bjorng

lib/compiler/src/compile.erl

@@ -736,6 +736,9 @@ value are listed.
   this kind of warning for the types in `Types`, where `Types` is a tuple
   `{TypeName,Arity}` or a list of such tuples.
 
+- **`nowarn_behaviours`** - By default, warnings are emitted for issues
+  with behaviours. Use this option to turn off all warnings of this kind.
+
 - **`nowarn_conflicting_behaviours`** - By default, warnings are emitted when
   a module opts in to multiple behaviours that share the names of one or more
   callback functions. Use this option to turn off this kind of warning.

lib/stdlib/src/erl_lint.erl

@@ -823,6 +823,10 @@ start(File, Opts) ->
           bool_option(warn_update_literal, nowarn_update_literal,
                       true, Opts)},
          %% Behaviour warnings.
+         {behaviours,
+          bool_option(warn_behaviours,
+                      nowarn_behaviours,
+                      true, Opts)},
          {conflicting_behaviours,
           bool_option(warn_conflicting_behaviours,
                       nowarn_conflicting_behaviours,
@@ -1256,8 +1260,13 @@ post_traversal_check(Forms, St0) ->
 %% check_behaviour(State0) -> State
 %% Check that the behaviour attribute is valid.
 
-check_behaviour(St0) ->
-    behaviour_check(St0#lint.behaviour, St0).
+check_behaviour(St) ->
+    case is_warn_enabled(behaviours, St) of
+        true ->
+            behaviour_check(St#lint.behaviour, St);
+        false ->
+            St
+    end.
 
 %% behaviour_check([{Anno,Behaviour}], State) -> State'
 %%  Check behaviours for existence and defined functions.

lib/stdlib/test/erl_lint_SUITE.erl

@@ -3472,10 +3472,14 @@ behaviour_basic(Config) when is_list(Config) ->
 	 ],
     [] = run(Config, Ts),
 
-    Subst = #{behaviour1 => [nowarn_undefined_behaviour_func],
-              behaviour2 => [nowarn_undefined_behaviour_func],
-              behaviour4 => [nowarn_undefined_behaviour_func]},
+    Subst0 = #{behaviour1 => [nowarn_undefined_behaviour_func],
+               behaviour2 => [nowarn_undefined_behaviour_func],
+               behaviour4 => [nowarn_undefined_behaviour_func]},
+    [] = run(Config, rewrite(Ts, Subst0)),
+
+    Subst = #{K => [nowarn_behaviours] || K := _ <- Subst0},
     [] = run(Config, rewrite(Ts, Subst)),
+
     ok.
 
 %% Basic tests with multiple behaviours.
@@ -3781,13 +3785,16 @@ otp_11861(Conf) when is_list(Conf) ->
 	 ],
     [] = run(Conf, Ts),
 
-    Subst = #{otp_11861_1 => [nowarn_conflicting_behaviours],
-              otp_11861_11 => [nowarn_ill_defined_behaviour_callbacks],
-              otp_11861_12 => [nowarn_undefined_behaviour],
-              otp_11861_13 => [nowarn_undefined_behaviour],
-              otp_11861_17 => [nowarn_undefined_behaviour_callbacks],
-              otp_11861_19 => [nowarn_ill_defined_optional_callbacks]
-             },
+    Subst0 = #{otp_11861_1 => [nowarn_conflicting_behaviours],
+               otp_11861_11 => [nowarn_ill_defined_behaviour_callbacks],
+               otp_11861_12 => [nowarn_undefined_behaviour],
+               otp_11861_13 => [nowarn_undefined_behaviour],
+               otp_11861_17 => [nowarn_undefined_behaviour_callbacks],
+               otp_11861_19 => [nowarn_ill_defined_optional_callbacks]
+              },
+    [] = run(Conf, rewrite(Ts, Subst0)),
+
+    Subst = #{K => [nowarn_behaviours] || K := _ <- Subst0},
     [] = run(Conf, rewrite(Ts, Subst)),
 
     true = code:set_path(CodePath),