Merge pull request #437 from wilzbach/stdx-allocator

Switch to using the frozen stdx-allocator package
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>

.gitmodules

@@ -10,4 +10,7 @@
 	branch = master
 [submodule "dsymbol"]
 	path = dsymbol
-	url = https://github.com/dlang-community/dsymbol.git
+	url = https://github.com/dlang-community/dsymbol.git
+[submodule "stdx-allocator"]
+	path = stdx-allocator
+	url = https://github.com/dlang-community/stdx-allocator

build.bat

@@ -18,6 +18,10 @@ for /r "libdparse/src" %%F in (*.d) do call set libdparse_modules=%%libdparse_mo
 set msgspack_modules=
 for /r "msgpack-d/src" %%F in (*.d) do call set msgspack_modules=%%msgspack_modules%% "%%F"
 
+set stdx_allocator=
+for /r "stdx-allocator/source/stdx/allocator" %%F in (*.d) do call set stdx_allocator=%%stdx_allocator%% "%%F"
+for /r "stdx-allocator/source/stdx/allocator/building_blocks" %%F in (*.d) do call set stdx_allocator=%%stdx_allocator%% "%%F"
+
 set client_name=bin\dcd-client
 set server_name=bin\dcd-server
 
@@ -38,9 +42,11 @@ set server_name=bin\dcd-server
  %common_modules%^
  %containers_modules%^
  %msgspack_modules%^
+ %stdx_allocator%^
  -Icontainers/src^
  -Imsgpack-d/src^
  -Ilibdparse/src^
+ -Istdx-allocator/source^
  -wi -O -release^
  -of%server_name%
 

containers

@@ -1 +1 @@
-Subproject commit 0ed30c2626270a18b420bc04143b7a9c2eea0f42
+Subproject commit 6c5504cc80b75192b24cebe93209521c03f806d8

dsymbol

@@ -1 +1 @@
-Subproject commit 89f6ee88bf8d0fc0df232cba56bf797f5b3b0487
+Subproject commit 5b90412457ac5f1d67c04e4da01587edfd529ad5

dub.json

@@ -7,9 +7,10 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "dsymbol": "~>0.3.0-alpha.1",
-    "libdparse": "~>0.8.0-alpha.3",
-    "msgpack-d": "~>1.0.0-beta.3"
+    "dsymbol": "~>0.3.0-beta.3",
+    "libdparse": "~>0.8.0-alpha.4",
+    "msgpack-d": "~>1.0.0-beta.3",
+    "stdx-allocator": "~>2.77.0"
   },
   "versions": ["built_with_dub"],
   "configurations": [

libdparse

@@ -1 +1 @@
-Subproject commit 687c0ca751747ebe498c183da1a3ee3119d57932
+Subproject commit f3323ce90a41c24cf874fd257ccbf6cc0b1be285

makefile

@@ -12,6 +12,7 @@ LDC := ldc2
 
 DPARSE_DIR := libdparse
 DSYMBOL_DIR := dsymbol
+STDXALLOC_DIR := stdx-allocator
 
 githash:
 	git log -1 --format="%H" > githash.txt
@@ -57,6 +58,7 @@ SERVER_SRC := \
 	$(shell find src/dcd/common -name "*.d")\
 	$(shell find src/dcd/server -name "*.d")\
 	$(shell find ${DSYMBOL_DIR}/src -name "*.d")\
+	$(shell find ${STDXALLOC_DIR}/source -name "*.d")\
 	${DPARSE_DIR}/src/dparse/ast.d\
 	${DPARSE_DIR}/src/dparse/entities.d\
 	${DPARSE_DIR}/src/dparse/lexer.d\
@@ -82,6 +84,7 @@ DMD_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
 	-I${DPARSE_DIR}/src\
 	-I${DSYMBOL_DIR}/src\
+	-I${STDXALLOC_DIR}/source\
 	-J.\
 	-wi\
 	-O\

msgpack-d

@@ -1 +1 @@
-Subproject commit e6a5a69d2f86f2a0f7f7dad9de7080a55a929e46
+Subproject commit 500940918243cf0468028e552605204c6aa46807

src/dcd/server/autocomplete/util.d

@@ -19,7 +19,7 @@
 module dcd.server.autocomplete.util;
 
 import std.algorithm;
-import std.experimental.allocator;
+import stdx.allocator;
 import std.experimental.logger;
 import std.range;
 import std.string;

src/dcd/server/main.d

@@ -24,8 +24,8 @@ import std.array;
 import std.conv;
 import std.datetime.stopwatch : AutoStart, StopWatch;
 import std.exception : enforce;
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator;
+import stdx.allocator;
+import stdx.allocator.mallocator;
 import std.experimental.logger;
 import std.file;
 import std.getopt;

stdx-allocator

@@ -0,0 +1 @@
+Subproject commit 7487970b58f4a2c0d495679329a8a2857111f3fd