From 4511030af27dcd351b7d09138a06cff8eb166306 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@fb.com>
Date: Thu, 23 Dec 2021 11:40:01 -0800
Subject: [PATCH] Minor code style tweaks for consistency

---
 test/args-test.cc | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/args-test.cc b/test/args-test.cc
index d9afbc1a..aa01fa4e 100644
--- a/test/args-test.cc
+++ b/test/args-test.cc
@@ -175,19 +175,12 @@ TEST(args_test, throw_on_copy) {
 }
 
 TEST(args_test, move_constructor) {
-  const int test_integer = 42;
-  const char* const test_c_string = "foo";
-
-  std::unique_ptr<fmt::dynamic_format_arg_store<fmt::format_context>>
-      store_uptr(new fmt::dynamic_format_arg_store<fmt::format_context>());
-  store_uptr->push_back(test_integer);
-  store_uptr->push_back(std::string(test_c_string));
-  store_uptr->push_back(fmt::arg("a1", test_c_string));
-
-  fmt::dynamic_format_arg_store<fmt::format_context> moved_store(
-      std::move(*store_uptr));
-  store_uptr.reset();
-  EXPECT_EQ(
-      fmt::vformat("{} {} {a1}", moved_store),
-      std::to_string(test_integer) + " " + test_c_string + " " + test_c_string);
+  using store_type = fmt::dynamic_format_arg_store<fmt::format_context>;
+  auto store = std::unique_ptr<store_type>(new store_type());
+  store->push_back(42);
+  store->push_back(std::string("foo"));
+  store->push_back(fmt::arg("a1", "foo"));
+  auto moved_store = std::move(*store);
+  store.reset();
+  EXPECT_EQ(fmt::vformat("{} {} {a1}", moved_store), "42 foo foo");
 }