Replace find + assign with try_emplace

lucic71 · lucic71 · commit 5cce31e49f18 · 2026-05-13T20:07:56.000+01:00
diff --git a/cpp2rust/cpp_rule_preprocessor.cpp b/cpp2rust/cpp_rule_preprocessor.cpp
@@ -774,13 +774,12 @@ int main(int argc, char *argv[]) {
     llvm::json::Object file_root;
     cpp2rust::Extract(path, file_root);
     for (auto &[k, v] : file_root) {
-      if (root.find(k) != root.end()) {
+      if (!root.try_emplace(k, std::move(v)).second) {
         llvm::errs() << "ERROR: rule name " << k.str()
                      << " defined in multiple files in " << dir.string()
                      << '\n';
         return EXIT_FAILURE;
       }
-      root[k] = std::move(v);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -774,13 +774,12 @@ int main(int argc, char *argv[]) {`
`774`	`774`	`llvm::json::Object file_root;`
`775`	`775`	`cpp2rust::Extract(path, file_root);`
`776`	`776`	`for (auto &[k, v] : file_root) {`
`777`		`- if (root.find(k) != root.end()) {`
	`777`	`+ if (!root.try_emplace(k, std::move(v)).second) {`
`778`	`778`	`llvm::errs() << "ERROR: rule name " << k.str()`
`779`	`779`	`<< " defined in multiple files in " << dir.string()`
`780`	`780`	`<< '\n';`
`781`	`781`	`return EXIT_FAILURE;`
`782`	`782`	`}`
`783`		`- root[k] = std::move(v);`
`784`	`783`	`}`
`785`	`784`	`}`
`786`	`785`