commit 9877fca232717a9d4193b85009b7e89043b3d9d0
author Googler <gnish@google.com> Mon Sep 26 04:28:32 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Sep 26 04:29:44 2022 -0700
tree 9e0c750d0993019d51bc0e935f0d57173af288e1
parent 8a53266b6e8011691ebb2683127f12851e3a8245

Refactor BuildInfo so that it takes alphabetical order into account.

PiperOrigin-RevId: 476859483
Change-Id: Ied8cb1dbcc8cde6a4161140e5c6656154777386b

tools/cpp/build_info_entry_set.cc

diff --git a/tools/cpp/build_info_entry_set.cc b/tools/cpp/build_info_entry_set.cc
index 3132b70..f7d0b47 100644
--- a/tools/cpp/build_info_entry_set.cc
+++ b/tools/cpp/build_info_entry_set.cc
@@ -15,6 +15,7 @@
 #include "tools/cpp/build_info_entry_set.h"
 
 #include <iostream>
+#include <map>
 
 namespace bazel {
 namespace tools {
@@ -42,17 +43,14 @@
   return false;
 }
 
-std::unordered_map<std::string, BuildInfoEntrySet::BuildInfoEntry>
+std::map<std::string, BuildInfoEntrySet::BuildInfoEntry>
 BuildInfoEntrySet::TranslateKeys(
-    const std::unordered_map<std::string, std::string>& key_translations,
+    const std::map<std::string, std::string>& translation_keys,
     std::unordered_map<std::string, KeyDescription>& keys,
     std::unordered_map<std::string, std::string>& values) {
-  std::unordered_map<std::string, BuildInfoEntrySet::BuildInfoEntry>
-      translated_keys =
-          std::unordered_map<std::string, BuildInfoEntrySet::BuildInfoEntry>();
-  for (const auto& i : key_translations) {
-    std::string translation = i.first;
-    std::string key = i.second;
+  std::map<std::string, BuildInfoEntrySet::BuildInfoEntry> translated_keys =
+      std::map<std::string, BuildInfoEntrySet::BuildInfoEntry>();
+  for (const auto& [translation, key] : translation_keys) {
     std::string key_value;
     if (GetKeyValue(key, keys, values, key_value) &&
         keys.find(key) != keys.end()) {