Merge pull request #12 from ydb-platform/Replace-TList-to-std_list

Replaced TList with std::list
ydb-platform · Jan 23, 2024 · 49486a8 · 49486a8
2 parents 23a61e0 + e6a656a
commit 49486a8
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,3 +84,4 @@ util/all_thread.cpp
 util/all_util.cpp
 util/charset/all_charset.cpp
 
+cmake-build-debug
diff --git a/library/cpp/dbg_output/dumpers.h b/library/cpp/dbg_output/dumpers.h
@@ -111,7 +111,7 @@ struct TDumper<TDeque<T, A>>: public TSeqDumper {
 };
 
 template <class T, class A>
-struct TDumper<TList<T, A>>: public TSeqDumper {
+struct TDumper<std::list<T, A>>: public TSeqDumper {
 };
 
 //associatives

diff --git a/library/cpp/getopt/small/last_getopt_parser.h b/library/cpp/getopt/small/last_getopt_parser.h
@@ -3,9 +3,8 @@
 #include "last_getopt_opts.h"
 
 #include <library/cpp/colorizer/fwd.h>
-
+#include <list>
 #include <util/generic/hash_set.h>
-#include <util/generic/list.h>
 
 namespace NLastGetopt {
     /**
@@ -53,7 +52,7 @@ namespace NLastGetopt {
         typedef THashSet<const TOpt*> TdOptSet;
         TdOptSet OptsSeen_; //the set of options that have been met during parsing
 
-        TList<const TOpt*> OptsDefault_;
+        std::list<const TOpt*> OptsDefault_;
 
     private:
         void Init(const TOpts* options, int argc, const char* argv[]);

diff --git a/library/cpp/monlib/counters/counters.h b/library/cpp/monlib/counters/counters.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <list>
 #include <util/datetime/base.h>
 #include <util/generic/algorithm.h>
-#include <util/generic/list.h>
 #include <util/generic/map.h>
 #include <util/generic/ptr.h>
 #include <util/generic/singleton.h>
@@ -248,7 +248,7 @@ namespace NMonitoring {
 
     private:
         TCollection* Groups;
-        TList<TOldGroup> OldGroups;
+        std::list<TOldGroup> OldGroups;
         TSpinLock AddMutex;
 
         ui64 Timeout;
@@ -295,7 +295,7 @@ namespace NMonitoring {
             Groups->Free();
             delete Groups;
             Groups = nullptr;
-            typename TList<TOldGroup>::iterator i;
+            typename std::list<TOldGroup>::iterator i;
             for (i = OldGroups.begin(); i != OldGroups.end(); ++i) {
                 delete i->Collection;
                 i->Collection = nullptr;

diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp
@@ -525,7 +525,7 @@ class TColoredProcessor: public ITestSuiteProcessor, public NColorizer::TColors
             return f();
         }
 
-        TList<TString> args(1, "--is-forked-internal");
+        std::list<TString> args(1, "--is-forked-internal");
         args.push_back(Sprintf("+%s::%s", suite.data(), name));
 
         // stdin is ignored - unittest should not need them...

diff --git a/util/generic/list_ut.cpp b/util/generic/list_ut.cpp
diff --git a/util/generic/queue_ut.cpp b/util/generic/queue_ut.cpp
@@ -153,7 +153,7 @@ Y_UNIT_TEST_SUITE(TYQueueTest) {
     }
 
     Y_UNIT_TEST(queue1) {
-        TQueue<int, TList<int>> q;
+        TQueue<int, std::list<int>> q;
 
         q.push(42);
         q.push(101);

diff --git a/util/generic/ut/ya.make b/util/generic/ut/ya.make
@@ -26,7 +26,6 @@ SRCS(
     generic/iterator_range_ut.cpp
     generic/iterator_ut.cpp
     generic/lazy_value_ut.cpp
-    generic/list_ut.cpp
     generic/map_ut.cpp
     generic/mapfindptr_ut.cpp
     generic/maybe_ut.cpp

diff --git a/util/system/shellcommand.cpp b/util/system/shellcommand.cpp
@@ -190,7 +190,7 @@ class TShellCommand::TImpl
     : public TAtomicRefCount<TShellCommand::TImpl> {
 private:
     TString Command;
-    TList<TString> Arguments;
+    std::list<TString> Arguments;
     TShellCommandOptions Options_;
     TString WorkDir;
 
@@ -263,7 +263,7 @@ class TShellCommand::TImpl
 #endif
 
 public:
-    inline TImpl(const TStringBuf cmd, const TList<TString>& args, const TShellCommandOptions& options, const TString& workdir)
+    inline TImpl(const TStringBuf cmd, const std::list<TString>& args, const TShellCommandOptions& options, const TString& workdir)
         : Command(ToString(cmd))
         , Arguments(args)
         , Options_(options)
@@ -1087,14 +1087,14 @@ void TShellCommand::TImpl::Communicate(TProcessInfo* pi) {
     TerminateIsRequired(pi);
 }
 
-TShellCommand::TShellCommand(const TStringBuf cmd, const TList<TString>& args, const TShellCommandOptions& options,
+TShellCommand::TShellCommand(const TStringBuf cmd, const std::list<TString>& args, const TShellCommandOptions& options,
                              const TString& workdir)
     : Impl(new TImpl(cmd, args, options, workdir))
 {
 }
 
 TShellCommand::TShellCommand(const TStringBuf cmd, const TShellCommandOptions& options, const TString& workdir)
-    : Impl(new TImpl(cmd, TList<TString>(), options, workdir))
+    : Impl(new TImpl(cmd, std::list<TString>(), options, workdir))
 {
 }
 

diff --git a/util/system/shellcommand.h b/util/system/shellcommand.h
@@ -2,7 +2,6 @@
 
 #include <util/generic/noncopyable.h>
 #include <util/generic/string.h>
-#include <util/generic/list.h>
 #include <util/generic/hash.h>
 #include <util/generic/strbuf.h>
 #include <util/generic/maybe.h>
@@ -13,7 +12,7 @@
 #include "thread.h"
 #include "mutex.h"
 #include <sys/types.h>
-
+#include <list>
 #include <atomic>
 
 class TShellCommandOptions {
@@ -369,7 +368,7 @@ class TShellCommand: public TNonCopyable {
      * @param options execution options
      * @todo store entire options structure
      */
-    TShellCommand(const TStringBuf cmd, const TList<TString>& args, const TShellCommandOptions& options = TShellCommandOptions(),
+    TShellCommand(const TStringBuf cmd, const std::list<TString>& args, const TShellCommandOptions& options = TShellCommandOptions(),
                   const TString& workdir = TString());
     TShellCommand(const TStringBuf cmd, const TShellCommandOptions& options = TShellCommandOptions(), const TString& workdir = TString());
     ~TShellCommand();

diff --git a/util/ysaveload.h b/util/ysaveload.h
@@ -356,10 +356,6 @@ template <class T, class A>
 class TSerializer<std::vector<T, A>>: public TVectorSerializer<std::vector<T, A>> {
 };
 
-template <class T, class A>
-class TSerializer<TList<T, A>>: public TVectorSerializer<TList<T, A>> {
-};
-
 template <class T, class A>
 class TSerializer<std::list<T, A>>: public TVectorSerializer<std::list<T, A>> {
 };

diff --git a/util/ysaveload_ut.cpp b/util/ysaveload_ut.cpp
@@ -5,7 +5,6 @@
 #include <util/memory/pool.h>
 #include <util/stream/buffer.h>
 #include <util/memory/blob.h>
-#include <util/generic/list.h>
 #include <util/generic/map.h>
 #include <util/generic/hash_multi_map.h>
 #include <util/generic/deque.h>
@@ -391,7 +390,7 @@ class TSaveLoadTest: public TTestBase {
     void TestList() {
         TBufferStream s;
 
-        TList<int> list = {0, 1, 10};
+        std::list<int> list = {0, 1, 10};
         Save(&s, list);
 
         list.clear();