Fix specialization of MapValueBuilder::InsertOrUpdate

jcking · kyessenov · commit a4f8c6f4d372 · 2023-05-18T15:54:46.000Z
PiperOrigin-RevId: 531006717
diff --git a/base/values/map_value_builder.h b/base/values/map_value_builder.h
@@ -1268,23 +1268,19 @@ class MapValueBuilderImpl<K, V, UK, void> : public MapValueBuilderInterface {
   }
 
   absl::StatusOr<bool> InsertOrUpdate(const K& key, const Handle<V>& value) {
-    return storage_.insert_or_assign(std::make_pair(key, value)).second;
+    return storage_.insert_or_assign(key, value).second;
   }
 
   absl::StatusOr<bool> InsertOrUpdate(const K& key, Handle<V>&& value) {
-    return storage_.insert_or_assign(std::make_pair(key, std::move(value)))
-        .second;
+    return storage_.insert_or_assign(key, std::move(value)).second;
   }
 
   absl::StatusOr<bool> InsertOrUpdate(K&& key, const Handle<V>& value) {
-    return storage_.insert_or_assign(std::make_pair(std::move(key), value))
-        .second;
+    return storage_.insert_or_assign(std::move(key), value).second;
   }
 
   absl::StatusOr<bool> InsertOrUpdate(K&& key, Handle<V>&& value) {
-    return storage_
-        .insert_or_assign(std::make_pair(std::move(key), std::move(value)))
-        .second;
+    return storage_.insert_or_assign(std::move(key), std::move(value)).second;
   }
 
   bool Has(const Handle<Value>& key) const override { return Has(key.As<K>()); }

Original file line number	Diff line number	Diff line change
`@@ -1268,23 +1268,19 @@ class MapValueBuilderImpl<K, V, UK, void> : public MapValueBuilderInterface {`
`1268`	`1268`	`}`
`1269`	`1269`
`1270`	`1270`	`absl::StatusOr<bool> InsertOrUpdate(const K& key, const Handle<V>& value) {`
`1271`		`- return storage_.insert_or_assign(std::make_pair(key, value)).second;`
	`1271`	`+ return storage_.insert_or_assign(key, value).second;`
`1272`	`1272`	`}`
`1273`	`1273`
`1274`	`1274`	`absl::StatusOr<bool> InsertOrUpdate(const K& key, Handle<V>&& value) {`
`1275`		`- return storage_.insert_or_assign(std::make_pair(key, std::move(value)))`
`1276`		`- .second;`
	`1275`	`+ return storage_.insert_or_assign(key, std::move(value)).second;`
`1277`	`1276`	`}`
`1278`	`1277`
`1279`	`1278`	`absl::StatusOr<bool> InsertOrUpdate(K&& key, const Handle<V>& value) {`
`1280`		`- return storage_.insert_or_assign(std::make_pair(std::move(key), value))`
`1281`		`- .second;`
	`1279`	`+ return storage_.insert_or_assign(std::move(key), value).second;`
`1282`	`1280`	`}`
`1283`	`1281`
`1284`	`1282`	`absl::StatusOr<bool> InsertOrUpdate(K&& key, Handle<V>&& value) {`
`1285`		`- return storage_`
`1286`		`- .insert_or_assign(std::make_pair(std::move(key), std::move(value)))`
`1287`		`- .second;`
	`1283`	`+ return storage_.insert_or_assign(std::move(key), std::move(value)).second;`
`1288`	`1284`	`}`
`1289`	`1285`
`1290`	`1286`	`bool Has(const Handle<Value>& key) const override { return Has(key.As<K>()); }`