Table: Use std::vectors

src/libutil/include/nix/util/table.hh

@@ -2,11 +2,9 @@
 
 #include "nix/util/types.hh"
 
-#include <list>
-
 namespace nix {
 
-typedef std::list<Strings> Table;
+typedef std::vector<std::vector<std::string>> Table;
 
 void printTable(Table & table);
 

src/libutil/table.cc

@@ -16,17 +16,15 @@ void printTable(Table & table)
 
     for (auto & i : table) {
         assert(i.size() == nrColumns);
-        Strings::iterator j;
+        size_t column = 0;
-        size_t column;
+        for (auto j = i.begin(); j != i.end(); ++j, ++column)
-        for (j = i.begin(), column = 0; j != i.end(); ++j, ++column)
             if (j->size() > widths[column])
                 widths[column] = j->size();
     }
 
     for (auto & i : table) {
-        Strings::iterator j;
+        size_t column = 0;
-        size_t column;
+        for (auto j = i.begin(); j != i.end(); ++j, ++column) {
-        for (j = i.begin(), column = 0; j != i.end(); ++j, ++column) {
             std::string s = *j;
             replace(s.begin(), s.end(), '\n', ' ');
             std::cout << s;

src/nix/nix-env/nix-env.cc

@@ -1062,7 +1062,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
                 continue;
 
             /* For table output. */
-            Strings columns;
+            std::vector<std::string> columns;
 
             /* For XML output. */
             XMLAttrs attrs;