Fix a use after move warning (#11256)

wu-hui · web-flow · commit 6ee712c08b9e · 2023-05-09T14:23:48.000-04:00
diff --git a/Firestore/core/src/model/mutation_batch.cc b/Firestore/core/src/model/mutation_batch.cc
@@ -97,7 +97,7 @@ absl::optional<FieldMask> MutationBatch::ApplyToLocalDocument(
       // TODO(dconeybe) Replace absl::nullopt with a FieldMask?
       auto new_mutated_fields = mutation.ApplyToLocalView(
           document, std::move(mutated_fields), local_write_time_);
-      mutated_fields.swap(new_mutated_fields);
+      mutated_fields = std::move(new_mutated_fields);
     }
   }
 
@@ -106,7 +106,7 @@ absl::optional<FieldMask> MutationBatch::ApplyToLocalDocument(
     if (mutation.key() == document.key()) {
       auto new_mutated_fields = mutation.ApplyToLocalView(
           document, std::move(mutated_fields), local_write_time_);
-      mutated_fields.swap(new_mutated_fields);
+      mutated_fields = std::move(new_mutated_fields);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ absl::optional<FieldMask> MutationBatch::ApplyToLocalDocument(`
`97`	`97`	`// TODO(dconeybe) Replace absl::nullopt with a FieldMask?`
`98`	`98`	`auto new_mutated_fields = mutation.ApplyToLocalView(`
`99`	`99`	`document, std::move(mutated_fields), local_write_time_);`
`100`		`- mutated_fields.swap(new_mutated_fields);`
	`100`	`+ mutated_fields = std::move(new_mutated_fields);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -106,7 +106,7 @@ absl::optional<FieldMask> MutationBatch::ApplyToLocalDocument(`
`106`	`106`	`if (mutation.key() == document.key()) {`
`107`	`107`	`auto new_mutated_fields = mutation.ApplyToLocalView(`
`108`	`108`	`document, std::move(mutated_fields), local_write_time_);`
`109`		`- mutated_fields.swap(new_mutated_fields);`
	`109`	`+ mutated_fields = std::move(new_mutated_fields);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`