Merge "Fix bugprone-use-after-move in ResourceParser"
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index f49c254..792a306 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -460,8 +460,8 @@
ParsedResource parsed_resource;
parsed_resource.config = config_;
parsed_resource.source = source_.WithLine(parser->line_number());
- // NOLINTNEXTLINE(bugprone-use-after-move) move+reset comment
parsed_resource.comment = std::move(comment);
+ comment.clear();
if (options_.visibility) {
parsed_resource.visibility_level = options_.visibility.value();
}
@@ -1040,6 +1040,7 @@
.source = item_source,
.comment = std::move(comment),
});
+ comment.clear();
// Execute group specific code.
func(entry_res, next_id);
@@ -1788,8 +1789,8 @@
ParsedResource child_resource;
child_resource.name = child_ref.name.value();
child_resource.source = item_source;
- // NOLINTNEXTLINE(bugprone-use-after-move) move+reset comment
child_resource.comment = std::move(comment);
+ comment.clear();
if (options_.visibility) {
child_resource.visibility_level = options_.visibility.value();
}