Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog/emplace.dd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Moved `std.conv.emplace` to core/lifetime.d

`emplace` is the counterpart to `destroy`, so it has been moved to also live in druntime (core/lifetime.d) where it is accessible by projects that use a shallow runtime library stack.
1 change: 1 addition & 0 deletions mak/COPY
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ COPY=\
$(IMPDIR)\core\cpuid.d \
$(IMPDIR)\core\demangle.d \
$(IMPDIR)\core\exception.d \
$(IMPDIR)\core\lifetime.d \
$(IMPDIR)\core\math.d \
$(IMPDIR)\core\memory.d \
$(IMPDIR)\core\runtime.d \
Expand Down
1 change: 1 addition & 0 deletions mak/DOCS
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ DOCS=\
$(DOCDIR)\core_cpuid.html \
$(DOCDIR)\core_demangle.html \
$(DOCDIR)\core_exception.html \
$(DOCDIR)\core_lifetime.html \
$(DOCDIR)\core_math.html \
$(DOCDIR)\core_memory.html \
$(DOCDIR)\core_runtime.html \
Expand Down
1 change: 1 addition & 0 deletions mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ SRCS=\
src\core\cpuid.d \
src\core\demangle.d \
src\core\exception.d \
src\core\lifetime.d \
src\core\math.d \
src\core\memory.d \
src\core\runtime.d \
Expand Down
3 changes: 3 additions & 0 deletions mak/WINDOWS
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ $(IMPDIR)\core\demangle.d : src\core\demangle.d
$(IMPDIR)\core\exception.d : src\core\exception.d
copy $** $@

$(IMPDIR)\core\lifetime.d : src\core\lifetime.d
copy $** $@

$(IMPDIR)\core\math.d : src\core\math.d
copy $** $@

Expand Down
20 changes: 10 additions & 10 deletions src/core/internal/traits.d
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ template TypeTuple(TList...)
template FieldTypeTuple(T)
{
static if (is(T == struct) || is(T == union))
alias FieldTypeTuple = typeof(T.tupleof[0 .. $ - __traits(isNested, T)]);
alias FieldTypeTuple = typeof(T.tupleof[0 .. $ - __traits(isNested, T)]);
else static if (is(T == class))
alias FieldTypeTuple = typeof(T.tupleof);
alias FieldTypeTuple = typeof(T.tupleof);
else
{
alias FieldTypeTuple = TypeTuple!T;
Expand Down Expand Up @@ -153,14 +153,14 @@ template isInnerClass(T) if (is(T == class))
template hasOuterMember(T...)
{
static if (T.length == 0)
enum hasOuterMember = false;
enum hasOuterMember = false;
else
enum hasOuterMember = T[0] == "outer" || hasOuterMember!(T[1 .. $]);
enum hasOuterMember = T[0] == "outer" || hasOuterMember!(T[1 .. $]);
}
enum isInnerClass = __traits(isSame, typeof(T.outer), __traits(parent, T)) && !hasOuterMember!(__traits(allMembers, T));
}
else
enum isInnerClass = false;
enum isInnerClass = false;
}

template dtorIsNothrow(T)
Expand Down Expand Up @@ -206,11 +206,11 @@ template anySatisfy(alias F, T...)
private template maxAlignment(U...)
{
static if (U.length == 0)
static assert(0);
static assert(0);
else static if (U.length == 1)
enum maxAlignment = U[0].alignof;
enum maxAlignment = U[0].alignof;
else static if (U.length == 2)
enum maxAlignment = U[0].alignof > U[1].alignof ? U[0].alignof : U[1].alignof;
enum maxAlignment = U[0].alignof > U[1].alignof ? U[0].alignof : U[1].alignof;
else
{
enum a = maxAlignment!(U[0 .. ($+1)/2]);
Expand Down Expand Up @@ -274,8 +274,8 @@ template hasElaborateAssign(S)
else static if (is(S == struct))
{
enum hasElaborateAssign = is(typeof(S.init.opAssign(rvalueOf!S))) ||
is(typeof(S.init.opAssign(lvalueOf!S))) ||
anySatisfy!(.hasElaborateAssign, FieldTypeTuple!S);
is(typeof(S.init.opAssign(lvalueOf!S))) ||
anySatisfy!(.hasElaborateAssign, FieldTypeTuple!S);
}
else
{
Expand Down
Loading