From 69b31bd2612807a71c8df734433a1d5e0cac7be6 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sun, 14 Jun 2020 19:08:42 +0200
Subject: [PATCH] remove useless scope STC from libdexed-d local decls

---
 dexed-d/src/symlist.d |  8 ++++----
 dexed-d/src/todos.d   | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dexed-d/src/symlist.d b/dexed-d/src/symlist.d
index e2cdc9e0..6398f7e6 100644
--- a/dexed-d/src/symlist.d
+++ b/dexed-d/src/symlist.d
@@ -34,11 +34,11 @@ export extern(C) FpcArray!char* listSymbols(const(char)* src, bool deep)
         errors ~= construct!(AstError)(cast(ErrorType) err, message, line, col);
     }
 
-    scope LexerConfig config;
-    scope RollbackAllocator rba;
-    scope StringCache sCache = StringCache(StringCache.defaultBucketCount);
+    LexerConfig config;
+    RollbackAllocator rba;
+    StringCache sCache = StringCache(StringCache.defaultBucketCount);
 
-    scope mod = src[0 .. src.strlen]
+    auto mod = src[0 .. src.strlen]
                 .getTokensForParser(config, &sCache)
                 .parseModule("", &rba, &handleErrors);
 
diff --git a/dexed-d/src/todos.d b/dexed-d/src/todos.d
index 9bdc6628..3988cbc5 100644
--- a/dexed-d/src/todos.d
+++ b/dexed-d/src/todos.d
@@ -10,20 +10,26 @@ import
 
 export extern(C) FpcArray!(char)* todoItems(const(char)* joinedFiles)
 {
-    scope Appender!(char[]) stream;
-    scope LexerConfig config = LexerConfig("", StringBehavior.source);
-    scope StringCache cache  = StringCache(4096);
+    Appender!(char[]) stream;
+    LexerConfig config = LexerConfig("", StringBehavior.source);
+    StringCache cache  = StringCache(4096);
     stream.reserve(32);
     stream.put("object TTodoItems\ritems=<");
     foreach (fname; joinedFilesToFiles(joinedFiles))
     {
         stream.reserve(256);
-        scope source = cast(ubyte[]) std.file.read(fname);
+        auto source = cast(ubyte[]) std.file.read(fname);
         DLexer(source, config, &cache)
             .filter!(a => a.type == tok!"comment")
             .each!(t => analyze(t, fname, stream));
+        destroy(source);
     }
     stream.put(">end");
+    scope (exit)
+    {
+        destroy(stream);
+        destroy(cache);
+    }
     return (FpcArray!char).fromArray(stream.data);
 }