mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 21:51:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Work around issue 22619 - Avoid Nullable copy ctor unless required

Browse source 
Copy ctors are still buggy, so unconditionally adding one for Nullable
is everything but a non-breaking change (and was added in the 2.098.1
point release).
This commit is contained in:
Martin Kinkelin 2022-01-10 16:48:25 +01:00
parent a5c467d836
commit 9db3a9afdf
1 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

42
std/typecons.d
View file

@ -2792,13 +2792,24 @@ struct Nullable(T)
}
}
this (ref return scope inout Nullable!T rhs) inout
static if (__traits(hasPostblit, T))
{
_isNull = rhs._isNull;
if (!_isNull)
_value.payload = rhs._value.payload;
else
_value = DontCallDestructorT.init;
this(this)
{
if (!_isNull)
_value.payload.__xpostblit();
}
}
else static if (__traits(hasCopyConstructor, T))
{
this(ref return scope inout Nullable!T rhs) inout
{
_isNull = rhs._isNull;
if (!_isNull)
_value.payload = rhs._value.payload;
else
_value = DontCallDestructorT.init;
}
}
/**
@ -9546,13 +9557,28 @@ unittest
{
int b;
@disable this(this);
this (ref return scope inout S rhs) inout
this(ref return scope inout S rhs) inout
{
this.b = rhs.b + 1;
}
}
Nullable!S s1 = S(1);
assert(s1.get().b == 2);
Nullable!S s2 = s1;
assert(s2.get().b > s1.get().b);
assert(s2.get().b == 3);
}
@safe unittest
{
static struct S
{
int b;
this(this) { ++b; }
}
Nullable!S s1 = S(1);
assert(s1.get().b == 2);
Nullable!S s2 = s1;
assert(s2.get().b == 3);
}