rule_map: improve error reporting

By showing the full entity name and also adding the usual
newline character after every "While ..." clause.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/buildtool/build_engine/base_maps/rule_map.cpp b/src/buildtool/build_engine/base_maps/rule_map.cpp
index 0a198490..a2b614b7 100644
--- a/src/buildtool/build_engine/base_maps/rule_map.cpp
+++ b/src/buildtool/build_engine/base_maps/rule_map.cpp
@@ -376,16 +376,15 @@ auto CreateRuleMap(gsl::not_null<RuleFileMap*> const& rule_file_map,
                     },
                     [logger, id](auto msg, auto fatal) {
                         (*logger)(fmt::format("While reading expression map "
-                                              "for rule {} in {}: {}",
-                                              id.GetNamedTarget().name,
-                                              id.GetNamedTarget().module,
+                                              "for rule {}:\n{}",
+                                              id.GetNamedTarget().ToString(),
                                               msg),
                                   fatal);
                     });
             },
             [logger, id](auto msg, auto fatal) {
-                (*logger)(fmt::format("While reading rule file in {}: {}",
-                                      id.GetNamedTarget().module,
+                (*logger)(fmt::format("While reading rule file for {}:\n{}",
+                                      id.GetNamedTarget().ToString(),
                                       msg),
                           fatal);
             });