commit 8f7990910130b45d7a697f8f13f8a73aa9c4cadc
author Protobuf Team Bot <protobuf-github-bot@google.com> Tue Jan 31 07:43:13 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 31 07:44:19 2023 -0800
tree f776e1335058d2bdf920e40d2a1cf97a946191ef
parent 36617198e18167139c7d6467f71b3354ce500b16

[ObjC] Provide NSCopying on all GPB*Descriptor objects.

PiperOrigin-RevId: 505999766

objectivec/GPBDescriptor.m

diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m
index 4eb6533..2fb7712 100644
--- a/objectivec/GPBDescriptor.m
+++ b/objectivec/GPBDescriptor.m
@@ -207,6 +207,13 @@
   [super dealloc];
 }
 
+// No need to provide -hash/-isEqual: as the instances are singletons and the
+// default from NSObject is fine.
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
+  // Immutable.
+  return [self retain];
+}
+
 - (void)setupOneofs:(const char **)oneofNames
               count:(uint32_t)count
       firstHasIndex:(int32_t)firstHasIndex {
@@ -325,10 +332,6 @@
   return result;
 }
 
-- (instancetype)copyWithZone:(__unused NSZone *)zone {
-  return [self retain];
-}
-
 - (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber {
   for (GPBFieldDescriptor *descriptor in fields_) {
     if (GPBFieldNumber(descriptor) == fieldNumber) {
@@ -415,6 +418,11 @@
   return [package_ hash];
 }
 
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
+  // Immutable.
+  return [self retain];
+}
+
 @end
 
 @implementation GPBOneofDescriptor
@@ -440,6 +448,13 @@
   [super dealloc];
 }
 
+// No need to provide -hash/-isEqual: as the instances are singletons and the
+// default from NSObject is fine.
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
+  // Immutable.
+  return [self retain];
+}
+
 - (NSString *)name {
   return (NSString *_Nonnull)@(name_);
 }
@@ -617,6 +632,13 @@
   [super dealloc];
 }
 
+// No need to provide -hash/-isEqual: as the instances are singletons and the
+// default from NSObject is fine.
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
+  // Immutable.
+  return [self retain];
+}
+
 - (GPBDataType)dataType {
   return description_->dataType;
 }
@@ -881,6 +903,13 @@
   [super dealloc];
 }
 
+// No need to provide -hash/-isEqual: as the instances are singletons and the
+// default from NSObject is fine.
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
+  // Immutable.
+  return [self retain];
+}
+
 - (BOOL)isClosed {
   return (flags_ & GPBEnumDescriptorInitializationFlag_IsClosed) != 0;
 }
@@ -1082,6 +1111,8 @@
   [super dealloc];
 }
 
+// No need to provide -hash/-isEqual: as the instances are singletons and the
+// default from NSObject is fine.
 - (instancetype)copyWithZone:(__unused NSZone *)zone {
   // Immutable.
   return [self retain];