Skip to content
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

Jump to bottom

Fix #1941 - real fix for the workaround #2274

Merged
merged 2 commits into from Mar 8, 2019
Merged

Fix #1941 - real fix for the workaround #2274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8fd00
Fix #1941 - real fix for the workaround
tchaloupka Mar 2, 2019
9d05440
split isSafeSerializer
tchaloupka Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 17 additions & 5 deletions data/vibe/data/serialization.d
View file
Open in desktop
Expand Up @@ -572,7 +572,7 @@ private template deserializeValueImpl(Serializer, alias Policy) {
static assert(Serializer.isSupportedValueType!(typeof(null)), "All serializers must support null values.");

// work around https://issues.dlang.org/show_bug.cgi?id=16528
static if (isSafeSerializer!Serializer) {
static if (isSafeDeserializer!Serializer) {
T deserializeValue(T, ATTRIBUTES...)(ref Serializer ser) @safe { return deserializeValueDeduced!(T, ATTRIBUTES)(ser); }
} else {
T deserializeValue(T, ATTRIBUTES...)(ref Serializer ser) { return deserializeValueDeduced!(T, ATTRIBUTES)(ser); }
Expand Down Expand Up @@ -1199,11 +1199,22 @@ private template isBuiltinTuple(T, string member)
}

// heuristically determines @safe'ty of the serializer by testing readValue and writeValue for type int
private enum isSafeSerializer(S) = __traits(compiles, (S s) @safe {
private template isSafeSerializer(S)
{
alias T = Traits!(int, DefaultPolicy);
s.writeValue!T(42);
s.readValue!(T, int)();
});
static if (__traits(hasMember, S, "writeValue"))
enum isSafeSerializer = __traits(compiles, (S s) @safe { s.writeValue!T(42); });
else static assert(0, "Serializer is missing required writeValue method");
}

// heuristically determines @safe'ty of the deserializer by testing readValue and writeValue for type int
private template isSafeDeserializer(S)
{
alias T = Traits!(int, DefaultPolicy);
static if (__traits(hasMember, S, "readValue"))
enum isSafeDeserializer = __traits(compiles, (S s) @safe { s.readValue!(T, int)(); });
else static assert(0, "Deserializer is missing required readValue method");
}

private template hasAttribute(T, alias decl) { enum hasAttribute = findFirstUDA!(T, decl).found; }

Expand Down Expand Up @@ -1340,6 +1351,7 @@ private template getExpandedFieldsData(T, FIELDS...)

version (unittest) {
static assert(isSafeSerializer!TestSerializer);
static assert(isSafeDeserializer!TestSerializer);

private struct TestSerializer {
import std.array, std.conv, std.string;
Expand Down