fx.collections: move string to fx

fx.collections/array.c

@@ -1,7 +1,7 @@
 #include <fx/collections/array.h>
-#include <fx/collections/string.h>
 #include <fx/iterator.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <stdlib.h>
 #include <string.h>
 

fx.collections/datetime.c

@@ -1,6 +1,6 @@
 #include <fx/collections/datetime.h>
-#include <fx/collections/string.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 
 /*** PRIVATE DATA *************************************************************/
 

fx.collections/dict.c

@@ -1,7 +1,7 @@
 #include <fx/collections/dict.h>
-#include <fx/collections/string.h>
 #include <fx/status.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <stdbool.h>
 #include <stdlib.h>
 

fx.collections/hashmap.c

@@ -1,7 +1,7 @@
 #include <fx/collections/hashmap.h>
-#include <fx/collections/string.h>
 #include <fx/misc.h>
 #include <fx/status.h>
+#include <fx/string.h>
 #include <stdbool.h>
 #include <stdlib.h>
 

fx.collections/include/fx/collections/dict.h

@@ -2,11 +2,11 @@
 #define FX_DS_DICT_H_
 
 #include <fx/bst.h>
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/misc.h>
 #include <fx/queue.h>
 #include <fx/status.h>
+#include <fx/string.h>
 
 FX_DECLS_BEGIN;
 

fx.collections/include/fx/collections/tree.h

@@ -1,10 +1,10 @@
 #ifndef FX_DS_TREE_H_
 #define FX_DS_TREE_H_
 
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/misc.h>
 #include <fx/queue.h>
+#include <fx/string.h>
 
 FX_DECLS_BEGIN;
 

fx.collections/include/fx/collections/uuid.h

@@ -1,9 +1,9 @@
 #ifndef FX_DS_UUID_H_
 #define FX_DS_UUID_H_
 
-#include <fx/collections/string.h>
 #include <fx/macros.h>
 #include <fx/status.h>
+#include <fx/string.h>
 
 #define FX_UUID_NBYTES     16
 #define FX_UUID_STRING_MAX 37

fx.collections/uuid.c

@@ -1,6 +1,6 @@
 #include <ctype.h>
-#include <fx/collections/string.h>
 #include <fx/collections/uuid.h>
+#include <fx/string.h>
 #include <fx/stringstream.h>
 #include <stdio.h>
 #include <stdlib.h>

fx/include/fx/string.h

@@ -1,5 +1,5 @@
-#ifndef FX_DS_STRING_H_
-#define FX_DS_STRING_H_
+#ifndef FX_STRING_H_
+#define FX_STRING_H_
 
 #include <ctype.h>
 #include <fx/encoding.h>

fx/string.c

@@ -1,6 +1,6 @@
 #include <ctype.h>
-#include <fx/collections/string.h>
 #include <fx/stream.h>
+#include <fx/string.h>
 #include <fx/stringstream.h>
 #include <stdarg.h>
 #include <stdbool.h>