Skip to content

std.container.slist: Fix a @safe cannot call @system issue #6295

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

Merged
dlang-bot merged 2 commits into from
Mar 27, 2018
Merged

std.container.slist: Fix a @safe cannot call @system issue #6295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3cfd08
dip1000.mak+std.container.slist: Fix a -dip1000 compilable issue
Mar 22, 2018
1443d75
Enable -dip1000 for std.algorithm.mutation
wilzbach Mar 22, 2018
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
4 changes: 2 additions & 2 deletions dip1000.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ aa[std.zlib]=-dip1000
aa[std.algorithm.comparison]=-dip1000
aa[std.algorithm.internal]=-dip1000
aa[std.algorithm.iteration]=-dip25 # WIP_carblue
aa[std.algorithm.mutation]=-dip25 # depends on std.container.slist (https://github.com/dlang/phobos/pull/6295)
aa[std.algorithm.mutation]=-dip1000
aa[std.algorithm.package]=-dip1000
aa[std.algorithm.searching]=-dip25 # depends on https://github.com/dlang/phobos/pull/6246 merged and std.algorithm.comparison fixed
aa[std.algorithm.setops]=-dip1000
Expand Down Expand Up @@ -95,7 +95,7 @@ aa[std.container.binaryheap]=-dip1000
aa[std.container.dlist]=-dip1000
aa[std.container.package]=-dip1000
aa[std.container.rbtree]=-dip25 # DROP
aa[std.container.slist]=-dip25 # -dip1000 -version=DIP1000 depends on https://github.com/dlang/phobos/pull/6295 merged
aa[std.container.slist]=-dip1000 -version=DIP1000 # merged https://github.com/dlang/phobos/pull/6295
aa[std.container.util]=-dip25 # TODO

aa[std.datetime.date]=-dip25 # depends on a fix for writefln
Expand Down
31 changes: 28 additions & 3 deletions std/container/slist.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,22 @@ struct SList(T)
/**
Constructor taking a number of nodes
*/
this(U)(U[] values...) if (isImplicitlyConvertible!(U, T))
this(U)(scope U[] values...) if (isImplicitlyConvertible!(U, T))
{
insertFront(values);
initialize();
Node* n, newRoot;
foreach (item; values)
{
auto newNode = new Node(null, item);
(newRoot ? n._next : newRoot) = newNode;
n = newNode;
}
if (n)
{
// Last node points to the old root
n._next = _first;
_first = newRoot;
}
}

/**
Expand Down Expand Up @@ -359,7 +372,7 @@ Complexity: $(BIGOH m), where $(D m) is the length of $(D stuff)
{
initialize();
size_t result;
Node * n, newRoot;
Node* n, newRoot;
foreach (item; stuff)
{
auto newNode = new Node(null, item);
Expand Down Expand Up @@ -911,3 +924,15 @@ Complexity: $(BIGOH n)
s.reverse();
assert(s[].equal([3, 2, 1]));
}

version(DIP1000)
@safe unittest
{
int i, j;
auto s = SList!(int*)([&i, &j]);
assert(s._root);
assert(s._root._next);
assert(s._root._next._next);
assert(s._root._next._payload == &i);
assert(s._root._next._next._payload == &j);
}