Skip to content

std.container.rbtree: Fix -dip1000 compilable issues (alternative) #6362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wilzbach wants to merge 1 commit into from
Closed

std.container.rbtree: Fix -dip1000 compilable issues (alternative) #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dip1000.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ aa[std.container.array]=-dip1000
aa[std.container.binaryheap]=-dip1000
aa[std.container.dlist]=-dip1000
aa[std.container.package]=-dip1000
aa[std.container.rbtree]=-dip25 # DROP
aa[std.container.rbtree]=-dip1000 -version=DIP1000
aa[std.container.slist]=-dip25 # -dip1000 -version=DIP1000 depends on an update (no insertFront's code duplication in constructor) and merge of https://github.com/dlang/phobos/pull/6295
aa[std.container.util]=-dip25 # depends on rbtree and slist = -dip1000

Expand Down
35 changes: 21 additions & 14 deletions std/container/rbtree.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
debug(RBDoChecks)
check();
++_length;
return result;
return result is null;
}
else
{
Expand All @@ -950,7 +950,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
}
debug(RBDoChecks)
check();
return Tuple!(bool, "added", Node, "n")(added, result);
return added;
}
}

Expand Down Expand Up @@ -1122,7 +1122,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
*
* Complexity: $(BIGOH log(n))
*/
size_t stableInsert(Stuff)(Stuff stuff) if (isImplicitlyConvertible!(Stuff, Elem))
size_t stableInsert(Stuff)(scope Stuff stuff) @safe if (isImplicitlyConvertible!(Stuff, Elem))
{
static if (allowDuplicates)
{
Expand All @@ -1131,7 +1131,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
}
else
{
return(_add(stuff).added ? 1 : 0);
return _add(stuff) ? 1 : 0;
}
}

Expand All @@ -1143,7 +1143,8 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
*
* Complexity: $(BIGOH m * log(n))
*/
size_t stableInsert(Stuff)(Stuff stuff) if (isInputRange!Stuff && isImplicitlyConvertible!(ElementType!Stuff, Elem))
size_t stableInsert(Stuff)(scope Stuff stuff) @safe
if (isInputRange!Stuff && isImplicitlyConvertible!(ElementType!Stuff, Elem))
{
size_t result = 0;
static if (allowDuplicates)
Expand All @@ -1158,7 +1159,7 @@ if (is(typeof(binaryFun!less(T.init, T.init))))
{
foreach (e; stuff)
{
if (_add(e).added)
if (_add(e))
++result;
}
}
Expand Down Expand Up @@ -1401,7 +1402,7 @@ assert(equal(rbt[], [5]));
}

/++ Ditto +/
size_t removeKey(U)(U[] elems)
size_t removeKey(U)(scope U[] elems)
if (isImplicitlyConvertible!(U, Elem))
{
immutable lenBefore = length;
Expand All @@ -1423,7 +1424,7 @@ assert(equal(rbt[], [5]));
}

/++ Ditto +/
size_t removeKey(Stuff)(Stuff stuff)
size_t removeKey(Stuff)(scope Stuff stuff)
if (isInputRange!Stuff &&
isImplicitlyConvertible!(ElementType!Stuff, Elem) &&
!isDynamicArray!Stuff)
Expand Down Expand Up @@ -1724,7 +1725,7 @@ assert(equal(rbt[], [5]));
* Constructor. Pass in an array of elements, or individual elements to
* initialize the tree with.
*/
this(Elem[] elems...)
this(scope Elem[] elems...)
{
_setup();
stableInsert(elems);
Expand All @@ -1733,7 +1734,7 @@ assert(equal(rbt[], [5]));
/**
* Constructor. Pass in a range of elements to initialize the tree with.
*/
this(Stuff)(Stuff stuff) if (isInputRange!Stuff && isImplicitlyConvertible!(ElementType!Stuff, Elem))
this(Stuff)(scope Stuff stuff) if (isInputRange!Stuff && isImplicitlyConvertible!(ElementType!Stuff, Elem))
{
_setup();
stableInsert(stuff);
Expand Down Expand Up @@ -1970,16 +1971,22 @@ if ( is(typeof(binaryFun!less((ElementType!Stuff).init, (ElementType!Stuff).init
auto rbt3 = redBlackTree(chain([0, 1], [7, 5]));
assert(equal(rbt3[], [0, 1, 5, 7]));

auto rbt4 = redBlackTree(chain(["hello"], ["world"]));
assert(equal(rbt4[], ["hello", "world"]));

auto rbt5 = redBlackTree!true(chain([0, 1], [5, 7, 5]));
assert(equal(rbt5[], [0, 1, 5, 5, 7]));

auto rbt6 = redBlackTree!("a > b", true)(chain([0.1, 1.3], [5.9, 7.2, 5.9]));
assert(equal(rbt6[], [7.2, 5.9, 5.9, 1.3, 0.1]));
}

version(DIP1000) {} else
@safe pure unittest
{
import std.algorithm.comparison : equal;
import std.range : chain;
auto rbt4 = redBlackTree(chain(["hello"], ["world"]));
assert(equal(rbt4[], ["hello", "world"]));
}

@safe pure unittest
{
import std.array : array;
Expand Down Expand Up @@ -2049,7 +2056,7 @@ if ( is(typeof(binaryFun!less((ElementType!Stuff).init, (ElementType!Stuff).init
@safe pure unittest
{
class C {}
RedBlackTree!(C, "cast(void*)a < cast(void*) b") tree;
RedBlackTree!(C, (a,b) @trusted => cast(void*) a < cast(void*) b) tree;
}

@safe pure unittest // const/immutable elements (issue 17519)
Expand Down