Update proto files from upstream.

Using commit 237332ef92daf83a53e76decd6ac43c3fcee782b.
apple · Jun 27, 2024 · 5c8c836 · 5c8c836
1 parent c257143
commit 5c8c836
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Protos/Conformance/conformance/conformance.proto b/Protos/Conformance/conformance/conformance.proto
@@ -86,8 +86,8 @@ message ConformanceRequest {
 
   // The full name for the test message to use; for the moment, either:
   // protobuf_test_messages.proto3.TestAllTypesProto3 or
-  // protobuf_test_messages.google.protobuf.TestAllTypesProto2 or
-  // protobuf_test_messages.editions.google.protobuf.TestAllTypesProto2 or
+  // protobuf_test_messages.proto2.TestAllTypesProto2 or
+  // protobuf_test_messages.editions.proto2.TestAllTypesProto2 or
   // protobuf_test_messages.editions.proto3.TestAllTypesProto3 or
   // protobuf_test_messages.editions.TestAllTypesEdition2023.
   string message_type = 4;

diff --git a/Protos/upstream/conformance/conformance.proto b/Protos/upstream/conformance/conformance.proto
@@ -86,8 +86,8 @@ message ConformanceRequest {
 
   // The full name for the test message to use; for the moment, either:
   // protobuf_test_messages.proto3.TestAllTypesProto3 or
-  // protobuf_test_messages.google.protobuf.TestAllTypesProto2 or
-  // protobuf_test_messages.editions.google.protobuf.TestAllTypesProto2 or
+  // protobuf_test_messages.proto2.TestAllTypesProto2 or
+  // protobuf_test_messages.editions.proto2.TestAllTypesProto2 or
   // protobuf_test_messages.editions.proto3.TestAllTypesProto3 or
   // protobuf_test_messages.editions.TestAllTypesEdition2023.
   string message_type = 4;

diff --git a/Protos/upstream/google/protobuf/unittest_string_type.proto b/Protos/upstream/google/protobuf/unittest_string_type.proto
@@ -0,0 +1,16 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+edition = "2023";
+
+package protobuf_unittest;
+
+import "google/protobuf/cpp_features.proto";
+
+message EntryProto {
+  bytes value = 3 [features.(pb.cpp).string_type = CORD];
+}