inaka · elbrujohalcon · Jun 18, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ If you want to override the [pre-defined rules](#pre-defined-rules), for a given
 to specify them in a `rules` key which is a list of items with the following structure
 `{Module, Function, RuleConfig}`, or `{Module, Function}` - if the rule takes no configuration
 values. You can also `disable` certain rules if you want to, by specifying them in the `rules` key
-and passing `disable` as a third parameter.
+and passing `disable` as a third argument.
 
 #### Disabling Rules
 

diff --git a/RULES.md b/RULES.md
@@ -58,8 +58,8 @@ Most, if not all, of the rules will present (opinionated) documentation sections
 - [No Operator With Same Values](doc_rules/elvis_style/no_operation_on_same_value.md)
 - [No Redundant Blank Lines](doc_rules/elvis_text_style/no_redundant_blank_lines.md)
 - [No `receive` Without Timeout](doc_rules/elvis_style/no_receive_without_timeout.md)
-- [No Single-Clause Case Statements](doc_rules/elvis_style/no_single_clause_case.md)
-- [No Single-Match Maybe Statements](doc_rules/elvis_style/no_single_match_maybe.md)
+- [No Single-Clause Case Expressions](doc_rules/elvis_style/no_single_clause_case.md)
+- [No Single-Match Maybe Blocks](doc_rules/elvis_style/no_single_match_maybe.md)
 - [No Space After `#`](doc_rules/elvis_style/no_space_after_pound.md)
 - [No Space](doc_rules/elvis_style/no_space.md)
 - [No Spec With Records](doc_rules/elvis_style/no_spec_with_records.md)

diff --git a/doc_rules/elvis_style/god_modules.md b/doc_rules/elvis_style/god_modules.md
@@ -1,13 +1,13 @@
 # God Modules ![](https://img.shields.io/badge/BEAM-yes-orange)
 
-The number of functions in a module should be limited to a maximum threshold.
+The number of exported functions in a module should be limited to a maximum threshold.
 
 ## Rationale
 
-Limiting the number of functions in a module helps maintain clarity, modularity, and readability
-in the codebase. A module with too many functions can become difficult to navigate, understand,
-and maintain. By restricting the number of functions, you encourage smaller, more focused modules
-that adhere to the [Single Responsibility Principle](https://en.wikipedia.org/wiki/Single-responsibility_principle)
+Limiting the number of functions exported from a module helps maintain clarity, modularity, and
+readability in the codebase. A module with too many exported functions can become difficult to
+consume and understand, from an API perspective. By restricting the number of exported functions,
+you encourage smaller, more focused modules that adhere to the [Single Responsibility Principle](https://en.wikipedia.org/wiki/Single-responsibility_principle)
 (SRP). This also makes the code easier to test, debug, and extend.
 
 ## Options

diff --git a/doc_rules/elvis_style/no_behavior_info.md b/doc_rules/elvis_style/no_behavior_info.md
@@ -1,7 +1,7 @@
 # No Behavior Info ![](https://img.shields.io/badge/BEAM-yes-orange)
 
 The use of `behaviour_info` (or `behavior_info`) attributes should be avoided; use `-callback`
-annotations instead.
+attributes instead.
 
 ## Avoid
 

diff --git a/doc_rules/elvis_style/no_init_lists.md b/doc_rules/elvis_style/no_init_lists.md
@@ -1,7 +1,7 @@
 # No Init Lists [![](https://img.shields.io/badge/since-4.0.0-blue)](https://github.com/inaka/elvis_core/releases/tag/4.0.0) ![](https://img.shields.io/badge/BEAM-yes-orange)
 
 Lists as the argument for the `init/1` callback should be avoided when implementing
-`gen_*` behaviours; use a tuple, a map, or a record instead.
+`gen_*` behaviors; use a tuple, a map, or a record instead.
 
 ## Avoid
 
@@ -35,7 +35,7 @@ init(#{ name := Name, timeout := Timeout }) ->
 
 ## Rationale
 
-When implementing `gen_server`, `gen_statem`, or other `gen_*` behaviours, using a list as the
+When implementing `gen_server`, `gen_statem`, or other `gen_*` behaviors, using a list as the
 argument to the `init/1` callback is discouraged. Tuples, maps, and records provide clearer
 structure, better pattern matching, and improved readability.
 Lists are typically used for variable-length collections and may lead to ambiguous or less

diff --git a/doc_rules/elvis_style/no_nested_hrls.md b/doc_rules/elvis_style/no_nested_hrls.md
@@ -1,4 +1,4 @@
-# No Types [![](https://img.shields.io/badge/since-4.1.0-blue)](https://github.com/inaka/elvis_core/releases/tag/4.1.0) ![](https://img.shields.io/badge/HRL--only-yes-magenta)
+# No Nested Header Files [![](https://img.shields.io/badge/since-4.1.0-blue)](https://github.com/inaka/elvis_core/releases/tag/4.1.0) ![](https://img.shields.io/badge/HRL--only-yes-magenta)
 
 `-include` and `-include_lib` attributes **in header files** should be avoided.
 

diff --git a/doc_rules/elvis_style/no_receive_without_timeout.md b/doc_rules/elvis_style/no_receive_without_timeout.md
@@ -29,7 +29,7 @@ A `receive` block without a timeout will wait indefinitely if no matching messag
 your timeout explicit you:
 
 - avoid hanging processes.
-- improve testability (deterministic behaviour under test failure conditions).
+- improve testability (deterministic behavior under test failure conditions).
 - ease debug and recovery.
 - can implement retry and self-healing.
 - potentially avoid denial-of-service scenarios where waits are exploited.

diff --git a/doc_rules/elvis_style/no_single_clause_case.md b/doc_rules/elvis_style/no_single_clause_case.md
@@ -1,6 +1,6 @@
-# No Single-Clause Case Statements [![](https://img.shields.io/badge/since-3.0.0-blue)](https://github.com/inaka/elvis_core/releases/tag/3.0.0) ![](https://img.shields.io/badge/BEAM-yes-orange)
+# No Single-Clause Case Expressions [![](https://img.shields.io/badge/since-3.0.0-blue)](https://github.com/inaka/elvis_core/releases/tag/3.0.0) ![](https://img.shields.io/badge/BEAM-yes-orange)
 
-Single-clause case statements should be avoided.
+Single-clause case expressions should be avoided.
 
 ## Avoid
 
@@ -22,7 +22,7 @@ do:something("else")
 Using a `case` expression with only one clause is unnecessary and reduces code clarity. It adds
 syntactic overhead without providing meaningful branching logic. In such cases, a let-style
 assignment or direct pattern matching is typically more appropriate and idiomatic. Removing
-single-clause case statements also improves readability and simplifies the control flow.
+single-clause case expressions also improves readability and simplifies the control flow.
 
 ## Options
 

diff --git a/doc_rules/elvis_style/no_single_match_maybe.md b/doc_rules/elvis_style/no_single_match_maybe.md
@@ -1,6 +1,6 @@
-# No Single-Match Maybe Statements [![](https://img.shields.io/badge/since-4.1.0-blue)](https://github.com/inaka/elvis_core/releases/tag/4.1.0) ![](https://img.shields.io/badge/BEAM-yes-orange)
+# No Single-Match Maybe Blocks [![](https://img.shields.io/badge/since-4.1.0-blue)](https://github.com/inaka/elvis_core/releases/tag/4.1.0) ![](https://img.shields.io/badge/BEAM-yes-orange)
 
-Single-match maybe statements should be avoided.
+Single-match `maybe` blocks should be avoided.
 
 > [!NOTE]  
 > This rule only works under Erlang/OTP 27+.
@@ -19,7 +19,7 @@ end
 {ok, A} = do:something()
 ```
 
-Note that `maybe` statements with an `else` are perfectly acceptable, too:
+Note that `maybe` blocks with an `else` are perfectly acceptable, too:
 
 ```erlang
 maybe
@@ -31,10 +31,10 @@ end
 
 ## Rationale
 
-Using a `maybe` expression with only one match is unnecessary and reduces code clarity. It adds
+Using a `maybe` block with only one match is unnecessary and reduces code clarity. It adds
 syntactic overhead without providing meaningful branching logic. In such cases, a let-style
 assignment or direct pattern matching is typically more appropriate and idiomatic. Removing
-single-match `maybe` statements also improves readability and simplifies the control flow.
+single-match `maybe` block also improves readability and simplifies the control flow.
 
 ## Options
 

diff --git a/elvis.config b/elvis.config
@@ -17,7 +17,6 @@
                         {elvis_style, no_throw, disable},
                         {elvis_style, max_function_length, disable},
                         {elvis_style, max_function_clause_length, disable},
-                        {elvis_style, no_macros, disable},
                         {elvis_style, max_module_length, #{ignore => [elvis_style]}},
                         {elvis_style, no_common_caveats_call, #{
                             ignore => [

diff --git a/src/elvis_config.erl b/src/elvis_config.erl
@@ -22,8 +22,6 @@
 -type config() :: map().
 -type configs() :: [config()].
 
--define(DEFAULT_FILTER, "*.erl").
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Public
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -176,7 +174,7 @@ filter(Config) when is_list(Config) ->
 filter(#{filter := Filter}) ->
     Filter;
 filter(#{}) ->
-    ?DEFAULT_FILTER.
+    "*.erl".
 
 -spec files(RuleGroup :: configs() | config()) -> [elvis_file:file()].
 files(RuleGroup) when is_list(RuleGroup) ->
@@ -225,7 +223,7 @@ resolve_files(RuleGroup, Files) ->
                         warn,
                         "Searching for files in ~p, for ruleset ~p, "
                         "with filter ~p, yielded none. "
-                        "Update your configuration.",
+                        "Update your configuration",
                         [Dirs, RuleSet, Filter]
                     ),
                 ok = elvis_result:print_results([Error]);

diff --git a/src/elvis_core.erl b/src/elvis_core.erl
@@ -225,7 +225,7 @@ apply_rule({Module, Function, ConfigArgs}, {Result, Config, File}) ->
             end
         catch
             _:Reason:Stacktrace ->
-                Msg = "'~p' while applying rule '~p': ~p.",
+                Msg = "'~p' while applying rule '~p': ~p",
                 elvis_result:new(error, Msg, [Reason, Function, Stacktrace])
         end,
     {[RuleResult | Result], Config, File}.

diff --git a/src/elvis_gitignore.erl b/src/elvis_gitignore.erl
@@ -3,9 +3,6 @@
 
 -export([required_patterns/3, forbidden_patterns/3, default/1]).
 
--define(REQUIRED_PATTERN, "Your .gitignore file should contain pattern '~s'.").
--define(FORBIDDEN_PATTERN, "Your .gitignore file should not contain pattern '~s'.").
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Default values
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -83,9 +80,21 @@ check_patterns_in_lines(Lines, [Pattern | Rest], Results0, Mode) ->
             true ->
                 Results0;
             false when Mode =:= required ->
-                [elvis_result:new(item, ?REQUIRED_PATTERN, [Pattern]) | Results0];
+                [
+                    elvis_result:new_item(
+                        "Your .gitignore file should contain pattern '~s'",
+                        [Pattern]
+                    )
+                    | Results0
+                ];
             false when Mode =:= forbidden ->
-                [elvis_result:new(item, ?FORBIDDEN_PATTERN, [Pattern]) | Results0]
+                [
+                    elvis_result:new_item(
+                        "Your .gitignore file should not contain pattern '~s'",
+                        [Pattern]
+                    )
+                    | Results0
+                ]
         end,
     check_patterns_in_lines(Lines, Rest, Results, Mode).
 

diff --git a/src/elvis_project.erl b/src/elvis_project.erl
@@ -5,20 +5,6 @@
 
 -export_type([protocol_for_deps_config/0]).
 
--define(DEP_BRANCH,
-    "Dependency '~s' uses a branch. "
-    "Please change this to a tag or specific commit."
-).
--define(DEP_NO_GIT,
-    "Dependency '~s' is not using appropriate protocol, "
-    "please change this to something like '~s'"
-).
--define(OLD_CONFIG_FORMAT,
-    "The current Elvis configuration file has an outdated format. "
-    "Please check Elvis's GitHub repository to find out what the "
-    "new format is."
-).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Default values
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -49,11 +35,32 @@ protocol_for_deps(_Config, Target, RuleConfig) ->
     Deps = get_deps(Target),
     NoHexDeps = lists:filter(fun(Dep) -> not is_hex_dep(Dep) end, Deps),
     BadDeps = lists:filter(fun(Dep) -> is_not_git_dep(Dep, Regex) end, NoHexDeps),
-    lists:flatmap(
-        fun(Line) -> dep_to_result(Line, ?DEP_NO_GIT, {IgnoreDeps, Regex}) end,
+    lists:filtermap(
+        fun(Line) ->
+            AppName = appname_from_line(Line),
+
+            case lists:member(AppName, IgnoreDeps) of
+                true ->
+                    false;
+                false ->
+                    {true,
+                        elvis_result:new_item(
+                            "Dependency '~s' is not using appropriate protocol; prefer "
+                            "respecting regular expression '~s'",
+                            [AppName, Regex]
+                        )}
+            end
+        end,
         BadDeps
     ).
 
+appname_from_line({AppName, _}) ->
+    AppName;
+appname_from_line({AppName, _, _GitInfo}) ->
+    AppName;
+appname_from_line({AppName, _Vsn, _GitInfo, _Opts}) ->
+    AppName.
+
 -spec no_branch_deps(
     elvis_config:config(),
     elvis_file:file(),
@@ -64,7 +71,24 @@ no_branch_deps(_Config, Target, RuleConfig) ->
     IgnoreDeps = option(ignore, RuleConfig, no_branch_deps),
     Deps = get_deps(Target),
     BadDeps = lists:filter(fun is_branch_dep/1, Deps),
-    lists:flatmap(fun(Line) -> dep_to_result(Line, ?DEP_BRANCH, IgnoreDeps) end, BadDeps).
+    lists:filtermap(
+        fun(Line) ->
+            AppName = appname_from_line(Line),
+
+            case lists:member(AppName, IgnoreDeps) of
+                true ->
+                    false;
+                false ->
+                    {true, [
+                        elvis_result:new_item(
+                            "Dependency '~s' uses a branch; prefer a tag or a specific commit",
+                            [AppName]
+                        )
+                    ]}
+            end
+        end,
+        BadDeps
+    ).
 
 -spec old_configuration_format(
     elvis_config:config(),
@@ -83,7 +107,13 @@ old_configuration_format(_Config, Target, _RuleConfig) ->
                 false ->
                     [];
                 true ->
-                    [elvis_result:new(item, ?OLD_CONFIG_FORMAT, [])]
+                    [
+                        elvis_result:new_item(
+                            "The current Elvis configuration file has an outdated format. "
+                            "Please check Elvis's GitHub repository to find out what the "
+                            "new format is"
+                        )
+                    ]
             end
     end.
 
@@ -165,27 +195,6 @@ is_not_git_dep({_AppName, _Vsn, {_SCM, Url, {BranchTagOrRefType, _Branch}}, _Opt
 ->
     nomatch == re:run(Url, Regex, []).
 
-dep_to_result({AppName, _}, Message, {IgnoreDeps, Regex}) ->
-    case lists:member(AppName, IgnoreDeps) of
-        true ->
-            [];
-        false ->
-            [elvis_result:new(item, Message, [AppName, Regex])]
-    end;
-dep_to_result({AppName, _}, Message, IgnoreDeps) ->
-    case lists:member(AppName, IgnoreDeps) of
-        true ->
-            [];
-        false ->
-            [elvis_result:new(item, Message, [AppName])]
-    end;
-dep_to_result({AppName, _, GitInfo}, Message, {IgnoreDeps, Regex}) ->
-    dep_to_result({AppName, GitInfo}, Message, {IgnoreDeps, Regex});
-dep_to_result({AppName, _, GitInfo}, Message, IgnoreDeps) ->
-    dep_to_result({AppName, GitInfo}, Message, IgnoreDeps);
-dep_to_result({AppName, _Vsn, GitInfo, _Opts}, Message, IgnoreDeps) ->
-    dep_to_result({AppName, GitInfo}, Message, IgnoreDeps).
-
 %% Old config
 
 is_old_config(ElvisConfig) ->