mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-01 07:30:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ChooseResult: use of unions need to be @trusted

Browse source
This commit is contained in:
Walter Bright 2019-03-14 16:15:49 -07:00
parent 4d891a94f4
commit a7a847013e
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
std/range/package.d
View file

@ -1450,9 +1450,15 @@ private struct ChooseResult(R1, R2)
auto ref ExtraArgs extraArgs) auto ref ExtraArgs extraArgs)
{ {
if (r.r1Chosen) if (r.r1Chosen)
return foo(r.r1, extraArgs); {
ref get1(return ref ChooseResult r) @trusted { return r.r1; }
return foo(get1(r), extraArgs);
}
else else
return foo(r.r2, extraArgs); {
ref get2(return ref ChooseResult r) @trusted { return r.r2; }
return foo(get2(r), extraArgs);
}
} }
this(bool r1Chosen, return scope R1 r1, return scope R2 r2) @trusted this(bool r1Chosen, return scope R1 r1, return scope R2 r2) @trusted
@ -1475,6 +1481,15 @@ private struct ChooseResult(R1, R2)
} }
} }
void opAssign(return scope ChooseResult r) @trusted
{
r1Chosen = r.r1Chosen;
if (r1Chosen)
r1 = r.r1; // assigning to union members is @system
else
r2 = r.r2;
}
// Carefully defined postblit to postblit the appropriate range // Carefully defined postblit to postblit the appropriate range
static if (hasElaborateCopyConstructor!R1 static if (hasElaborateCopyConstructor!R1
|| hasElaborateCopyConstructor!R2) || hasElaborateCopyConstructor!R2)