feedback

Author: wu-hui

Firestore/Source/API/FIRLocalCacheSettings.mm

@@ -118,8 +118,9 @@ - (void)setInternalSettings:(const MemoryEagerGcSettings &)settings {
 }
 
 - (instancetype)init {
-  self = [super init];
-  self.internalSettings = MemoryEagerGcSettings{};
+  if (self = [super init]) {
+    self.internalSettings = MemoryEagerGcSettings{};
+  }
   return self;
 }
 
@@ -159,14 +160,16 @@ - (void)setInternalSettings:(const MemoryLruGcSettings &)settings {
 }
 
 - (instancetype)init {
-  self = [super init];
-  self.internalSettings = MemoryLruGcSettings{};
+  if (self = [super init]) {
+    self.internalSettings = MemoryLruGcSettings{};
+  }
   return self;
 }
 
 - (instancetype)initWithSizeBytes:(NSNumber *)size {
-  self = [super init];
-  self.internalSettings = MemoryLruGcSettings{}.WithSizeBytes(size.longLongValue);
+  if (self = [super init]) {
+    self.internalSettings = MemoryLruGcSettings{}.WithSizeBytes(size.longLongValue);
+  }
   return self;
 }
 
@@ -206,23 +209,24 @@ - (void)setInternalSettings:(const MemoryCacheSettings &)settings {
 }
 
 - (instancetype)init {
-  self = [super init];
-  self.internalSettings = MemoryCacheSettings{};
+  if (self = [super init]) {
+    self.internalSettings = MemoryCacheSettings{};
+  }
   return self;
 }
 
 - (instancetype)initWithGarbageCollectorSettings:
     (id<FIRMemoryGarbageCollectorSettings, NSObject>)settings {
-  self = [super init];
-
-  if ([settings isKindOfClass:[FIRMemoryEagerGCSettings class]]) {
-    FIRMemoryEagerGCSettings *casted = (FIRMemoryEagerGCSettings *)settings;
-    self.internalSettings =
-        MemoryCacheSettings{}.WithMemoryGarbageCollectorSettings(casted.internalSettings);
-  } else if ([settings isKindOfClass:[FIRMemoryLRUGCSettings class]]) {
-    FIRMemoryLRUGCSettings *casted = (FIRMemoryLRUGCSettings *)settings;
-    self.internalSettings =
-        MemoryCacheSettings{}.WithMemoryGarbageCollectorSettings(casted.internalSettings);
+  if (self = [super init]) {
+    if ([settings isKindOfClass:[FIRMemoryEagerGCSettings class]]) {
+      FIRMemoryEagerGCSettings *casted = (FIRMemoryEagerGCSettings *)settings;
+      self.internalSettings =
+          MemoryCacheSettings{}.WithMemoryGarbageCollectorSettings(casted.internalSettings);
+    } else if ([settings isKindOfClass:[FIRMemoryLRUGCSettings class]]) {
+      FIRMemoryLRUGCSettings *casted = (FIRMemoryLRUGCSettings *)settings;
+      self.internalSettings =
+          MemoryCacheSettings{}.WithMemoryGarbageCollectorSettings(casted.internalSettings);
+    }
   }
 
   return self;

Firestore/Source/Public/FirebaseFirestore/FIRLocalCacheSettings.h

@@ -68,7 +68,7 @@ NS_SWIFT_NAME(MemoryGarbageCollectorSettings)
 @end
 
 /**
- * Configures the SDK to use a eager garbage collector for memory cache.
+ * Configures the SDK to use an eager garbage collector for memory cache.
  *
  * Once configured, the SDK will remove any Firestore documents from memory as soon as they are not
  * used by any active queries.
@@ -101,13 +101,13 @@ NS_SWIFT_NAME(MemoryLRUGCSettings)
 @interface FIRMemoryLRUGCSettings : NSObject <NSCopying, FIRMemoryGarbageCollectorSettings>
 
 /**
- * Creates an instnace of `FIRMemoryLRUGCSettings`, with default target cache size 100MB.  SDK will
- * run garbage collection if the current cache size is larger than 100MB.
+ * Creates an instnace of `FIRMemoryLRUGCSettings`, with default target cache size 100MB. The SDK
+ * will run garbage collection if the current cache size is larger than 100MB.
  */
 - (instancetype)init;
 
 /**
- * Creates an instnace of `FIRMemoryLRUGCSettings`, with a custom target cache size. SDK will
+ * Creates an instnace of `FIRMemoryLRUGCSettings`, with a custom target cache size. The SDK will
  * run garbage collection if the current cache size is larger than the given size.
  */
 - (instancetype)initWithSizeBytes:(NSNumber *)size;

Firestore/core/src/api/settings.h

@@ -146,8 +146,7 @@ class MemoryGargabeCollectorSettings {
   }
 
  protected:
-  explicit MemoryGargabeCollectorSettings(MemoryGcKind kind)
-      : kind_(std::move(kind)) {
+  explicit MemoryGargabeCollectorSettings(MemoryGcKind kind) : kind_(kind) {
   }
   MemoryGcKind kind_;
 };