From 749fa95011718f67976a4ac201f448b09e6cbeeb Mon Sep 17 00:00:00 2001 From: Mickael Remond Date: Wed, 26 Dec 2018 17:32:39 +0100 Subject: [PATCH] Remove most Elixir warnings --- lib/ejabberd/config/config.ex | 4 ++-- lib/ejabberd/config/ejabberd_module.ex | 1 - lib/ejabberd/config/logger/ejabberd_logger.ex | 2 +- lib/ejabberd/config/validator/validation.ex | 2 -- lib/ejabberd/config/validator/validator_attrs.ex | 2 +- lib/mix/tasks/deps.tree.ex | 4 ++-- lib/mod_presence_demo.ex | 9 +++++++++ 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/ejabberd/config/config.ex b/lib/ejabberd/config/config.ex index 4d1270bc1..4d1728d16 100644 --- a/lib/ejabberd/config/config.ex +++ b/lib/ejabberd/config/config.ex @@ -23,7 +23,7 @@ defmodule Ejabberd.Config do # Could be also possible to interrupt the compilation&execution by throwing # an exception if necessary. def __before_compile__(_env) do - get_modules_parsed_in_order + get_modules_parsed_in_order() |> EjabberdModule.validate |> EjabberdLogger.log_errors end @@ -48,7 +48,7 @@ defmodule Ejabberd.Config do Returns a list with all the opts, formatted for ejabberd. """ def get_ejabberd_opts do - get_general_opts + get_general_opts() |> Dict.put(:modules, get_modules_parsed_in_order()) |> Dict.put(:listeners, get_listeners_parsed_in_order()) |> Ejabberd.Config.OptsFormatter.format_opts_for_ejabberd diff --git a/lib/ejabberd/config/ejabberd_module.ex b/lib/ejabberd/config/ejabberd_module.ex index 4de9a302e..6a74fe460 100644 --- a/lib/ejabberd/config/ejabberd_module.ex +++ b/lib/ejabberd/config/ejabberd_module.ex @@ -12,7 +12,6 @@ defmodule Ejabberd.Config.EjabberdModule do defstruct [:module, :attrs] alias Ejabberd.Config.EjabberdModule - alias Ejabberd.Config.Attr alias Ejabberd.Config.Validation @doc """ diff --git a/lib/ejabberd/config/logger/ejabberd_logger.ex b/lib/ejabberd/config/logger/ejabberd_logger.ex index 270fbfaa6..90970ba73 100644 --- a/lib/ejabberd/config/logger/ejabberd_logger.ex +++ b/lib/ejabberd/config/logger/ejabberd_logger.ex @@ -21,7 +21,7 @@ defmodule Ejabberd.Config.EjabberdLogger do defp do_log_errors({:attribute, errors}), do: Enum.each errors, &log_attribute_error/1 defp do_log_errors({:dependency, errors}), do: Enum.each errors, &log_dependency_error/1 - defp log_attribute_error({{attr_name, val}, :attr_not_supported}), do: + defp log_attribute_error({{attr_name, _val}, :attr_not_supported}), do: IO.puts "[ WARN ] Annotation @#{attr_name} is not supported." defp log_attribute_error({{attr_name, val}, :type_not_supported}), do: diff --git a/lib/ejabberd/config/validator/validation.ex b/lib/ejabberd/config/validator/validation.ex index 2fe00361a..af582676e 100644 --- a/lib/ejabberd/config/validator/validation.ex +++ b/lib/ejabberd/config/validator/validation.ex @@ -7,9 +7,7 @@ defmodule Ejabberd.Config.Validation do @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map} alias Ejabberd.Config.EjabberdModule - alias Ejabberd.Config.Attr alias Ejabberd.Config.Validator - alias Ejabberd.Config.ValidatorUtility @doc """ Given a module or a list of modules it runs validators on them diff --git a/lib/ejabberd/config/validator/validator_attrs.ex b/lib/ejabberd/config/validator/validator_attrs.ex index 94117ab21..6a85c068d 100644 --- a/lib/ejabberd/config/validator/validator_attrs.ex +++ b/lib/ejabberd/config/validator/validator_attrs.ex @@ -18,7 +18,7 @@ defmodule Ejabberd.Config.Validator.Attrs do def validate({modules, mod, errors}) do errors = Enum.reduce mod.attrs, errors, fn(attr, err) -> case Attr.validate(attr) do - {:ok, attr} -> err + {:ok, _attr} -> err {:error, attr, cause} -> put_error(err, :attribute, {attr, cause}) end end diff --git a/lib/mix/tasks/deps.tree.ex b/lib/mix/tasks/deps.tree.ex index 94cb85a50..50189c3d2 100644 --- a/lib/mix/tasks/deps.tree.ex +++ b/lib/mix/tasks/deps.tree.ex @@ -40,7 +40,7 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do end end - defp build_dependency_tree(mods, mod, []), do: %{module: mod, dependency: []} + defp build_dependency_tree(_mods, mod, []), do: %{module: mod, dependency: []} defp build_dependency_tree(mods, mod, deps) when is_list(deps) do dependencies = Enum.map deps, fn dep -> dep_deps = get_dependencies_of_mod(mods, dep) @@ -65,7 +65,7 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do defp keep_only_mods_not_used_as_dep(mods, mods_used_as_dep) do Enum.filter mods, fn %{module: mod} -> - not mod in mods_used_as_dep + mod not in mods_used_as_dep end end diff --git a/lib/mod_presence_demo.ex b/lib/mod_presence_demo.ex index 09bf58405..3ce512c3d 100644 --- a/lib/mod_presence_demo.ex +++ b/lib/mod_presence_demo.ex @@ -17,4 +17,13 @@ defmodule ModPresenceDemo do info('Receive presence for #{user}') :none end + + def depends(_host, _opts) do + [] + end + + def mod_options(_host) do + [] + end + end