From fcbdb927720e0299da4e27fb25bd3cf16dd26cf8 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 16 Feb 2023 10:02:03 +0000 Subject: simplify and use chomp() --- searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp index eb1876da45c..864dd64b98f 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp +++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp @@ -134,14 +134,8 @@ struct Compiler : public Blueprint::DependencyHandler { failed_set.insert(feature_name); auto trace = make_trace(skip_self); vespalib::string msg; - if (trace.empty()) { - msg = fmt("invalid %s: %s", describe(feature_name).c_str(), reason.c_str()); - } else { - msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); - } - if (msg.rbegin()[0] == '\n') { - msg.pop_back(); - } + msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); + msg.chomp(); errors.emplace_back(msg); } probe_stack(); -- cgit v1.2.3