Merge pull request #10 from vibe-d/improvements

Improvements

Author: s-ludwig

source/vibe/container/dictionarylist.d

@@ -321,8 +321,8 @@ struct DictionaryList(VALUE, bool case_sensitive = true, size_t NUM_STATIC_FIELD
 		}
 	}
 
-	private ptrdiff_t getIndex(in Field[] map, string key, uint keysum)
-	const {
+	private ptrdiff_t getIndex(scope const Field[] map, string key, uint keysum)
+	const scope {
 		foreach (i, ref const(Field) entry; map) {
 			static if (USE_HASHSUM) if (entry.keyCheckSum != keysum) continue;
 			if (matches(entry.key, key)) return i;

source/vibe/container/internal/utilallocator.d

@@ -63,7 +63,6 @@ void ensureNotInGC(T)(string info = null) nothrow
 
 
 final class RegionListAllocator(Allocator, bool leak = false) : IAllocator {
-	import vibe.internal.memory_legacy : AllocSize, alignedSize;
 	import std.algorithm.comparison : min, max;
 	import std.conv : emplace;
 
@@ -228,3 +227,38 @@ final class RegionListAllocator(Allocator, bool leak = false) : IAllocator {
 		return true;
 	}
 }
+
+unittest {
+	auto alloc = new RegionListAllocator!(shared(GCAllocator))(1024, GCAllocator.instance);
+	auto mem = alloc.allocate(8);
+	assert(mem.length == 8);
+	alloc.deallocateAll();
+}
+
+template AllocSize(T)
+{
+	static if (is(T == class)) {
+		// workaround for a strange bug where AllocSize!SSLStream == 0: TODO: dustmite!
+		enum dummy = T.stringof ~ __traits(classInstanceSize, T).stringof;
+		enum AllocSize = __traits(classInstanceSize, T);
+	} else {
+		enum AllocSize = T.sizeof;
+	}
+}
+
+enum size_t alignment = 0x10;
+enum size_t alignmentMask = alignment-1;
+
+size_t alignedSize(size_t sz) nothrow
+{
+	return ((sz + alignment - 1) / alignment) * alignment;
+}
+
+unittest {
+	foreach( i; 0 .. 20 ){
+		auto ia = alignedSize(i);
+		assert(ia >= i);
+		assert((ia & alignmentMask) == 0);
+		assert(ia < i+alignment);
+	}
+}