Merge pull request #114 from dlang-community/derp

dlang-bot · web-flow · commit 931aad7fbcdf · 2018-06-22T12:23:28.000+02:00
Correctly reset t-tree length field to zero when clearing
merged-on-behalf-of: Brian Schott &lt;Hackerpilot@users.noreply.github.com&gt;
diff --git a/src/containers/ttree.d b/src/containers/ttree.d
@@ -73,6 +73,7 @@ struct TTree(T, Allocator = Mallocator, bool allowDuplicates = false,
 	 */
 	void clear()
 	{
+		_length = 0;
 		if (root is null)
 			return;
 		static if (stateSize!Allocator > 0)
diff --git a/src/containers/unrolledlist.d b/src/containers/unrolledlist.d
@@ -211,7 +211,6 @@ struct UnrolledList(T, Allocator = Mallocator,
 	 */
 	bool remove(T item)
 	{
-		import containers.internal.backwards : popcnt;
 		if (_front is null)
 			return false;
 		bool retVal;
@@ -344,7 +343,6 @@ struct UnrolledList(T, Allocator = Mallocator,
 	}
 	body
 	{
-		import containers.internal.backwards : popcnt;
 		size_t i = nodeCapacity - 1;
 		while (_back.isFree(i))
 		{

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ struct TTree(T, Allocator = Mallocator, bool allowDuplicates = false,`
`73`	`73`	`*/`
`74`	`74`	`void clear()`
`75`	`75`	`{`
	`76`	`+ _length = 0;`
`76`	`77`	`if (root is null)`
`77`	`78`	`return;`
`78`	`79`	`static if (stateSize!Allocator > 0)`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ struct UnrolledList(T, Allocator = Mallocator,`
`211`	`211`	`*/`
`212`	`212`	`bool remove(T item)`
`213`	`213`	`{`
`214`		`- import containers.internal.backwards : popcnt;`
`215`	`214`	`if (_front is null)`
`216`	`215`	`return false;`
`217`	`216`	`bool retVal;`
`@@ -344,7 +343,6 @@ struct UnrolledList(T, Allocator = Mallocator,`
`344`	`343`	`}`
`345`	`344`	`body`
`346`	`345`	`{`
`347`		`- import containers.internal.backwards : popcnt;`
`348`	`346`	`size_t i = nodeCapacity - 1;`
`349`	`347`	`while (_back.isFree(i))`
`350`	`348`	`{`