commit 6047970d6e13fba9914467b65fd9ec241c3a250b
author William A. Kennington III <wak@google.com> Wed Dec 07 02:55:24 2022 -0800
committer William A. Kennington III <wak@google.com> Fri Dec 09 13:53:11 2022 -0800
tree bae57ac9185a56379307cd58c18474f8172a8381
parent 2f45037823db5fb0a949d6f760dfaa80e3c09058

str/cat: Rename from util/string

This still maintains backwards compatability.

Change-Id: Id984a9c2067aaa6986f892c1870834d77b8aec80
Signed-off-by: William A. Kennington III <wak@google.com>

include/meson.build

diff --git a/include/meson.build b/include/meson.build
index 83b536c..dc4de82 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -9,6 +9,7 @@
   'stdplus/pinned.hpp',
   'stdplus/raw.hpp',
   'stdplus/signal.hpp',
+  'stdplus/str/cat.hpp',
   'stdplus/util/cexec.hpp',
   'stdplus/util/string.hpp',
   'stdplus/zstring.hpp',

include/stdplus/str/cat.hpp

diff --git a/include/stdplus/util/string.hpp b/include/stdplus/str/cat.hpp
similarity index 100%
rename from include/stdplus/util/string.hpp
rename to include/stdplus/str/cat.hpp

include/stdplus/util/string.hpp

diff --git a/include/stdplus/util/string.hpp b/include/stdplus/util/string.hpp
new file mode 120000
index 0000000..6837a3c
--- /dev/null
+++ b/include/stdplus/util/string.hpp
@@ -0,0 +1 @@
+../str/cat.hpp
\ No newline at end of file

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 464bade..2a08ac5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -50,8 +50,8 @@
   'pinned.cpp',
   'raw.cpp',
   'signal.cpp',
+  'str/cat.cpp',
   'util/cexec.cpp',
-  'util/string.cpp',
   'zstring.cpp',
   'zstring_view.cpp',
 ]

src/str/cat.cpp

diff --git a/src/str/cat.cpp b/src/str/cat.cpp
new file mode 100644
index 0000000..2845a17
--- /dev/null
+++ b/src/str/cat.cpp
@@ -0,0 +1 @@
+#include <stdplus/str/cat.hpp>

src/util/string.cpp

diff --git a/src/util/string.cpp b/src/util/string.cpp
deleted file mode 100644
index d64a321..0000000
--- a/src/util/string.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <stdplus/util/string.hpp>

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 16e1e77..2f1d7f9 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -6,8 +6,8 @@
   'pinned': [stdplus_dep, gtest_main_dep],
   'raw': [stdplus_dep, gmock_dep, gtest_main_dep],
   'signal': [stdplus_dep, gtest_main_dep],
+  'str/cat': [stdplus_dep, gtest_main_dep],
   'util/cexec': [stdplus_dep, gtest_main_dep],
-  'util/string': [stdplus_dep, gtest_main_dep],
   'zstring': [stdplus_dep, gtest_main_dep],
   'zstring_view': [stdplus_dep, gtest_main_dep],
 }

test/str/cat.cpp

diff --git a/test/util/string.cpp b/test/str/cat.cpp
similarity index 83%
rename from test/util/string.cpp
rename to test/str/cat.cpp
index 8ab4e81..1633f6e 100644
--- a/test/util/string.cpp
+++ b/test/str/cat.cpp
@@ -1,14 +1,10 @@
 #include <gtest/gtest.h>
-#include <stdplus/util/string.hpp>
+#include <stdplus/str/cat.hpp>
 #include <string>
 #include <string_view>
 
 namespace stdplus
 {
-namespace util
-{
-namespace
-{
 
 using namespace std::string_literals;
 using namespace std::string_view_literals;
@@ -34,6 +30,4 @@
     EXPECT_EQ("func world", strCat("func"s, " world"));
 }
 
-} // namespace
-} // namespace util
 } // namespace stdplus