Merge pull request #159 from kubo39/replace-body-with-do

Replace body with do merged-on-behalf-of: Petar Kirov <[email protected]>
dlang-community · May 6, 2020 · 8cdffc8 · 8cdffc8
2 parents cc6fe5e + ec8ff7a
commit 8cdffc8
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/src/containers/cyclicbuffer.d b/src/containers/cyclicbuffer.d
@@ -42,7 +42,7 @@ struct CyclicBuffer(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}

diff --git a/src/containers/dynamicarray.d b/src/containers/dynamicarray.d
@@ -53,7 +53,7 @@ struct DynamicArray(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}

diff --git a/src/containers/hashmap.d b/src/containers/hashmap.d
@@ -42,7 +42,7 @@ struct HashMap(K, V, Allocator = Mallocator, alias hashFunction = generateHash!K
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -57,7 +57,7 @@ struct HashMap(K, V, Allocator = Mallocator, alias hashFunction = generateHash!K
 			assert(allocator !is null, "Allocator must not be null");
 			assert((bucketCount & (bucketCount - 1)) == 0, "bucketCount must be a power of two");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 			initialize(bucketCount);
@@ -79,7 +79,7 @@ struct HashMap(K, V, Allocator = Mallocator, alias hashFunction = generateHash!K
 		{
 			assert((bucketCount & (bucketCount - 1)) == 0, "bucketCount must be a power of two");
 		}
-		body
+		do
 		{
 			initialize(bucketCount);
 		}
@@ -251,7 +251,7 @@ struct HashMap(K, V, Allocator = Mallocator, alias hashFunction = generateHash!K
 	{
 		assert (result.length == _length);
 	}
-	body
+	do
 	{
 		import std.array : appender;
 		auto app = appender!(K[])();
@@ -283,7 +283,7 @@ struct HashMap(K, V, Allocator = Mallocator, alias hashFunction = generateHash!K
 	{
 		assert (result.length == _length);
 	}
-	body
+	do
 	{
 		import std.array : appender;
 		auto app = appender!(ContainerElementType!(This, V)[])();

diff --git a/src/containers/hashset.d b/src/containers/hashset.d
@@ -41,7 +41,7 @@ struct HashSet(T, Allocator = Mallocator, alias hashFunction = generateHash!T,
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -56,7 +56,7 @@ struct HashSet(T, Allocator = Mallocator, alias hashFunction = generateHash!T,
 			assert(allocator !is null, "Allocator must not be null");
 			assert ((bucketCount & (bucketCount - 1)) == 0, "bucketCount must be a power of two");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 			initialize(bucketCount);
@@ -73,7 +73,7 @@ struct HashSet(T, Allocator = Mallocator, alias hashFunction = generateHash!T,
 		{
 			assert ((bucketCount & (bucketCount - 1)) == 0, "bucketCount must be a power of two");
 		}
-		body
+		do
 		{
 			initialize(bucketCount);
 		}

diff --git a/src/containers/immutablehashset.d b/src/containers/immutablehashset.d
@@ -33,7 +33,7 @@ struct ImmutableHashSet(T, alias hashFunction)
 		import std.array : array;
 		assert (values.dup.sort().uniq().array().length == values.length);
 	}
-	body
+	do
 	{
 		empty = values.length == 0;
 		length = values.length;

diff --git a/src/containers/openhashset.d b/src/containers/openhashset.d
@@ -42,7 +42,7 @@ struct OpenHashSet(T, Allocator = Mallocator,
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -59,7 +59,7 @@ struct OpenHashSet(T, Allocator = Mallocator,
 			assert(allocator !is null, "Allocator must not be null");
 			assert ((initialCapacity & initialCapacity - 1) == 0, "initialCapacity must be a power of 2");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 			initialize(initialCapacity);
@@ -78,7 +78,7 @@ struct OpenHashSet(T, Allocator = Mallocator,
 		{
 			assert ((initialCapacity & initialCapacity - 1) == 0, "initialCapacity must be a power of 2");
 		}
-		body
+		do
 		{
 			initialize(initialCapacity);
 		}

diff --git a/src/containers/simdset.d b/src/containers/simdset.d
@@ -41,7 +41,7 @@ version (D_InlineAsm_X86_64) struct SimdSet(T, Allocator = Mallocator)
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}

diff --git a/src/containers/slist.d b/src/containers/slist.d
@@ -38,7 +38,7 @@ struct SList(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange!T)
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}

diff --git a/src/containers/ttree.d b/src/containers/ttree.d
@@ -56,7 +56,7 @@ struct TTree(T, Allocator = Mallocator, bool allowDuplicates = false,
 		{
 			assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -429,7 +429,7 @@ struct TTree(T, Allocator = Mallocator, bool allowDuplicates = false,
 		{
 			assert (!empty);
 		}
-		body
+		do
 		{
 			index++;
 			if (index >= nodeCapacity || current.isFree(index))
@@ -530,7 +530,7 @@ private:
 		assert (result.left is null);
 		assert (result.right is null);
 	}
-	body
+	do
 	{
 		import core.memory : GC;
 		import stdx.allocator : make;
@@ -552,7 +552,7 @@ private:
 	{
 		assert (n !is null);
 	}
-	body
+	do
 	{
 		import stdx.allocator : dispose;
 		import core.memory : GC;
@@ -656,7 +656,7 @@ private:
 			static if (isPointer!T || is (T == class) || is (T == interface))
 				assert (value !is null);
 		}
-		body
+		do
 		{
 			import std.algorithm : sort;
 			import std.range : assumeSorted;
@@ -834,7 +834,7 @@ private:
 		{
 			assert (!isEmpty());
 		}
-		body
+		do
 		{
 			if (left is null && right is null)
 			{
@@ -872,7 +872,7 @@ private:
 			static if (isPointer!T || is (T == class) || is(T == interface))
 				assert (result !is null);
 		}
-		body
+		do
 		{
 			if (left is null && right is null)
 			{

diff --git a/src/containers/unrolledlist.d b/src/containers/unrolledlist.d
@@ -48,7 +48,7 @@ struct UnrolledList(T, Allocator = Mallocator,
 		{
 			assert(allocator !is null);
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -254,7 +254,7 @@ struct UnrolledList(T, Allocator = Mallocator,
 		assert (!empty());
 		assert (_front.registry != 0);
 	}
-	body
+	do
 	{
 		version (LDC_64)
 		{
@@ -312,7 +312,7 @@ struct UnrolledList(T, Allocator = Mallocator,
 		assert (!empty);
 		assert (_front.registry != 0);
 	}
-	body
+	do
 	{
 		version (LDC_64)
 		{
@@ -339,7 +339,7 @@ struct UnrolledList(T, Allocator = Mallocator,
 		assert (!empty);
 		assert (!_back.empty);
 	}
-	body
+	do
 	{
 		size_t i = nodeCapacity - 1;
 		while (_back.isFree(i))
@@ -360,7 +360,7 @@ struct UnrolledList(T, Allocator = Mallocator,
 		assert (!empty);
 		assert (!_back.empty);
 	}
-	body
+	do
 	{
 		size_t i = nodeCapacity - 1;
 		while (_back.isFree(i))
@@ -544,7 +544,7 @@ private:
 		assert (second !is null);
 		assert (second is first.next);
 	}
-	body
+	do
 	{
 		size_t i;
 		ContainerStorageType!T[nodeCapacity] temp;
-Original file line number
+Diff line change
@@ Expand Up @@
     		{
     			assert(allocator !is null, "Allocator must not be null");
     		}
-    		body
+    		do
     		{
     			this.allocator = allocator;
     		}
@@ Expand Down @@