Merge pull request #7577 from rabbitmq/fix-type-specs

Fix various type specs

Author: dumbbell

deps/rabbit/src/amqqueue.erl

@@ -98,16 +98,16 @@
           slave_pids = [] :: [pid()] | none | '_',    %% transient
           sync_slave_pids = [] :: [pid()] | none| '_',%% transient
           recoverable_slaves = [] :: [atom()] | none | '_', %% durable
-          policy :: binary() | none | undefined | '_', %% durable, implicit
-                                                       %% update as above
-          operator_policy :: binary() | none | undefined | '_', %% durable,
-                                                                %% implicit
-                                                                %% update
-                                                                %% as above
+          policy :: proplists:proplist() |
+                    none | undefined | '_', %% durable, implicit update as
+                                            %% above
+          operator_policy :: proplists:proplist() |
+                             none | undefined | '_', %% durable, implicit
+                                                     %% update as above
           gm_pids = [] :: [{pid(), pid()}] | none | '_', %% transient
           decorators :: [atom()] | none | undefined | '_', %% transient,
-                                                          %% recalculated
-                                                          %% as above
+                                                           %% recalculated
+                                                           %% as above
           state = live :: atom() | none | '_', %% durable (have we crashed?)
           policy_version = 0 :: non_neg_integer() | '_',
           slave_pids_pending_shutdown = [] :: [pid()] | '_',
@@ -128,8 +128,9 @@
                           slave_pids :: [pid()] | none,
                           sync_slave_pids :: [pid()] | none,
                           recoverable_slaves :: [atom()] | none,
-                          policy :: binary() | none | undefined,
-                          operator_policy :: binary() | none | undefined,
+                          policy :: proplists:proplist() | none | undefined,
+                          operator_policy :: proplists:proplist() |
+                                             none | undefined,
                           gm_pids :: [{pid(), pid()}] | none,
                           decorators :: [atom()] | none | undefined,
                           state :: atom() | none,

deps/rabbit/src/rabbit_feature_flags.erl

@@ -175,10 +175,10 @@
 -type feature_props_extended() :: #{desc => string(),
                                     doc_url => string(),
                                     stability => stability(),
+                                    depends_on => [feature_name()],
                                     callbacks =>
                                     #{callback_name() => callback_fun_name()},
-                                    depends_on => [feature_name()],
-                                    provided_by => atom()}.
+                                    provided_by := atom()}.
 %% The feature flag properties, once expanded by this module when feature
 %% flags are discovered.
 %%

deps/rabbit/src/rabbit_ff_registry.erl

@@ -63,7 +63,7 @@
         end).
 
 -spec get(rabbit_feature_flags:feature_name()) ->
-    rabbit_feature_flags:feature_props() | undefined.
+    rabbit_feature_flags:feature_props_extended() | undefined.
 %% @doc
 %% Returns the properties of a feature flag.
 %%
@@ -75,7 +75,10 @@
 
 get(FeatureName) ->
     _ = rabbit_ff_registry_factory:initialize_registry(),
-    ?convince_dialyzer(?MODULE:get(FeatureName), undefined, #{}).
+    ?convince_dialyzer(
+       ?MODULE:get(FeatureName),
+       undefined,
+       #{provided_by => rabbit}).
 
 -spec list(all | enabled | disabled) -> rabbit_feature_flags:feature_flags().
 %% @doc

deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs

@@ -19,7 +19,7 @@ defmodule EnableFeatureFlagCommandTest do
 
     new_feature_flags = %{
       @feature_flag => %{
-        desc: "My feature flag",
+        desc: 'My feature flag',
         provided_by: :EnableFeatureFlagCommandTest,
         stability: :stable
       }

deps/rabbitmq_cli/test/ctl/list_feature_flags_command_test.exs

@@ -21,12 +21,12 @@ defmodule ListFeatureFlagsCommandTest do
 
     new_feature_flags = %{
       @flag1 => %{
-        desc: "My feature flag #1",
+        desc: 'My feature flag #1',
         provided_by: :ListFeatureFlagsCommandTest,
         stability: :stable
       },
       @flag2 => %{
-        desc: "My feature flag #2",
+        desc: 'My feature flag #2',
         provided_by: :ListFeatureFlagsCommandTest,
         stability: :stable
       }