Fix class merge issue; Update to Protobuf v3.12.2

dcarp · Jun 1, 2020 · dc28539 · dc28539
1 parent 29f6bca
commit dc28539
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/conformance/failure_list_d.txt b/conformance/failure_list_d.txt
@@ -35,7 +35,6 @@ Required.Proto3.JsonInput.EmptyFieldMask.ProtobufOutput
 Required.Proto3.JsonInput.RejectTopLevelNull
 
 # To be analysed and eventually fixed
-Required.Proto2.ProtobufInput.RepeatedScalarMessageMerge.ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataScalar.BOOL[0].ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataScalar.BYTES[0].ProtobufOutput
@@ -55,7 +54,5 @@ Required.Proto2.ProtobufInput.ValidDataScalar.STRING[0].ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[0].ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[5].ProtobufOutput
 Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[0].ProtobufOutput
-Required.Proto3.ProtobufInput.RepeatedScalarMessageMerge.JsonOutput
-Required.Proto3.ProtobufInput.RepeatedScalarMessageMerge.ProtobufOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.JsonOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.ProtobufOutput
diff --git a/conformance/run-conformance-test.sh b/conformance/run-conformance-test.sh
@@ -5,7 +5,7 @@ if cd protobuf >/dev/null 2>&1; then
 else
 	git clone https://github.com/google/protobuf.git && cd protobuf
 fi
-git checkout tags/v3.10.0 --detach
+git checkout tags/v3.12.2 --detach
 
 git submodule update --init --recursive
 

diff --git a/src/google/protobuf/decoding.d b/src/google/protobuf/decoding.d
@@ -412,7 +412,7 @@ if (isInputRange!R && (is(T == class) || is(T == struct)))
 
     R fieldRange = inputRange.takeLengthPrefixed;
 
-    field = fieldRange.fromProtobuf!T;
+    field = fieldRange.fromProtobuf!T(field);
 }
 
 void skipUnknown(R)(ref R inputRange, WireType wireType)