From 25e1622d47427a00704b99320b84ecc158554093 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 4 Jun 2015 13:14:39 -0700 Subject: [PATCH 1/8] Clean up unit test --- src/server/autocomplete.d | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d index c808303..7d76cdc 100644 --- a/src/server/autocomplete.d +++ b/src/server/autocomplete.d @@ -445,14 +445,14 @@ ImportKind determineImportKind(T)(T tokens) unittest { - Token[] t; - t ~= Token(tok!"import"); - t ~= Token(tok!"identifier"); - t ~= Token(tok!"."); - t ~= Token(tok!"identifier"); - t ~= Token(tok!":"); - t ~= Token(tok!"identifier"); - t ~= Token(tok!","); +Token[] t = [ +Token(tok!"import"), +Token(tok!"identifier"), +Token(tok!"."), +Token(tok!"identifier"), +Token(tok!":"), +Token(tok!"identifier"), +Token(tok!",")]; assert (determineImportKind(t) == ImportKind.selective); Token[] t2; t2 ~= Token(tok!"else"); From 9c7cb40b1dd3cd5474de6c2da3db1f1deb502e6a Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 4 Jun 2015 13:45:41 -0700 Subject: [PATCH 2/8] Update dsymbol --- dsymbol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsymbol b/dsymbol index ddf8c97..34507f8 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit ddf8c97753471388303d64a47bdade85cc4de003 +Subproject commit 34507f87b64da7c03978a2634f037118c8f1c3e7 From bf554066dffc6e48b175a20568da3edf6c823a81 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 4 Jun 2015 13:45:59 -0700 Subject: [PATCH 3/8] Update libdparse --- libdparse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdparse b/libdparse index 0dccfca..d4da4f0 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 0dccfca0e2a132b3c862a62da1c323ccd24e622d +Subproject commit d4da4f00f361528e67fe4cc9622fd681c9004e73 From 5413bf65d7f5f083583ee73b005d406a50f126f7 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 7 Jun 2015 17:08:28 -0700 Subject: [PATCH 4/8] Update dsymbol --- dsymbol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsymbol b/dsymbol index 34507f8..5d66473 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 34507f87b64da7c03978a2634f037118c8f1c3e7 +Subproject commit 5d66473c37a486f92249f55ed3d51afdc0fd0449 From 540314d565014e6a67f5533a77536cb953d67fdd Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 7 Jun 2015 17:08:58 -0700 Subject: [PATCH 5/8] Update containers --- containers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers b/containers index d732a67..618c169 160000 --- a/containers +++ b/containers @@ -1 +1 @@ -Subproject commit d732a67e76f60fd037547c3ffe8776c6deda6bab +Subproject commit 618c1694c731c4397bc8a46983e6a991c7d97a9e From c58e94706365245e1be5634dafd94f42e9544c1c Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 7 Jun 2015 17:09:17 -0700 Subject: [PATCH 6/8] Get rid of GC calls --- src/server/server.d | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/server/server.d b/src/server/server.d index 65251f4..062907d 100644 --- a/src/server/server.d +++ b/src/server/server.d @@ -32,8 +32,6 @@ import std.allocator; import std.exception : enforce; import std.experimental.logger; -import core.memory; - import msgpack; import dsymbol.string_interning; @@ -42,7 +40,6 @@ import messages; import autocomplete; import dsymbol.modulecache; import dsymbol.symbol; -import core.memory; import dcd_version; /// Name of the server configuration file @@ -114,9 +111,6 @@ int main(string[] args) sw.stop(); info(ModuleCache.symbolsAllocated, " symbols cached."); info("Startup completed in ", sw.peek().to!("msecs", float), " milliseconds."); - import core.memory : GC; - GC.minimize(); - // No relative paths version (Posix) chdir("/"); From ff4168df6b1c510efd6dde47d38c27a587879e59 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 7 Jun 2015 17:13:49 -0700 Subject: [PATCH 7/8] Remove other call to GC --- src/server/server.d | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/server.d b/src/server/server.d index 062907d..7ae2014 100644 --- a/src/server/server.d +++ b/src/server/server.d @@ -184,7 +184,6 @@ int main(string[] args) if (request.kind & RequestKind.addImport) { ModuleCache.addImportPaths(request.importPaths); - GC.minimize(); } if (request.kind & RequestKind.autocomplete) { From 0cf0f191bc5897c5a312d70d1e78a3718f045f55 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 7 Jun 2015 17:53:46 -0700 Subject: [PATCH 8/8] Update dsymbol --- dsymbol | 2 +- src/server/autocomplete.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsymbol b/dsymbol index 5d66473..05439bb 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 5d66473c37a486f92249f55ed3d51afdc0fd0449 +Subproject commit 05439bb691e8130f2ff75797fa79df5146c5d729 diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d index 7d76cdc..98baee9 100644 --- a/src/server/autocomplete.d +++ b/src/server/autocomplete.d @@ -528,7 +528,7 @@ body } } - string resolvedLocation = ModuleCache.resolveImportLoctation(path); + string resolvedLocation = ModuleCache.resolveImportLocation(path); if (resolvedLocation is null) { warning("Could not resolve location of ", path);