浏览代码

AK: Use StringBuilder::appendff() instead of appendf()

Andreas Kling 4 年之前
父节点
当前提交
764af6cdec
共有 4 个文件被更改,包括 11 次插入11 次删除
  1. 1 1
      AK/Hex.cpp
  2. 1 1
      AK/JsonObject.h
  3. 7 7
      AK/JsonObjectSerializer.h
  4. 2 2
      AK/LogStream.cpp

+ 1 - 1
AK/Hex.cpp

@@ -73,7 +73,7 @@ String encode_hex(ReadonlyBytes input)
     StringBuilder output(input.size() * 2);
     StringBuilder output(input.size() * 2);
 
 
     for (auto ch : input)
     for (auto ch : input)
-        output.appendf("%02x", ch);
+        output.appendff("{:02x}", ch);
 
 
     return output.build();
     return output.build();
 }
 }

+ 1 - 1
AK/JsonObject.h

@@ -172,7 +172,7 @@ inline void JsonValue::serialize(Builder& builder) const
         break;
         break;
 #if !defined(KERNEL)
 #if !defined(KERNEL)
     case Type::Double:
     case Type::Double:
-        builder.appendf("%g", m_value.as_double);
+        builder.appendff("{}", m_value.as_double);
         break;
         break;
 #endif
 #endif
     case Type::Int32:
     case Type::Int32:

+ 7 - 7
AK/JsonObjectSerializer.h

@@ -88,43 +88,43 @@ public:
     void add(const StringView& key, int value)
     void add(const StringView& key, int value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%d", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, unsigned value)
     void add(const StringView& key, unsigned value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%u", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, long value)
     void add(const StringView& key, long value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%ld", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, long unsigned value)
     void add(const StringView& key, long unsigned value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%lu", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, long long value)
     void add(const StringView& key, long long value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%lld", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, long long unsigned value)
     void add(const StringView& key, long long unsigned value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%llu", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     void add(const StringView& key, double value)
     void add(const StringView& key, double value)
     {
     {
         begin_item(key);
         begin_item(key);
-        m_builder.appendf("%f", value);
+        m_builder.appendff("{}", value);
     }
     }
 
 
     JsonArraySerializer<Builder> add_array(const StringView& key)
     JsonArraySerializer<Builder> add_array(const StringView& key)

+ 2 - 2
AK/LogStream.cpp

@@ -207,9 +207,9 @@ void dump_bytes(ReadonlyBytes bytes)
     auto flush = [&]() {
     auto flush = [&]() {
         if (nrepeat > 0) {
         if (nrepeat > 0) {
             if (nrepeat == 1)
             if (nrepeat == 1)
-                builder.appendf("%s0x%02x", prefix, static_cast<int>(buffered_byte));
+                builder.appendff("{}{:#02x}", prefix, static_cast<int>(buffered_byte));
             else
             else
-                builder.appendf("%s%zu * 0x%02x", prefix, nrepeat, static_cast<int>(buffered_byte));
+                builder.appendff("{}{} * {:#02x}", prefix, nrepeat, static_cast<int>(buffered_byte));
 
 
             nrepeat = 0;
             nrepeat = 0;
             prefix = ", ";
             prefix = ", ";