facebook · xiaozhuai · Jun 17, 2026
diff --git a/thrift/common/test/universal_name_test.cc b/thrift/common/test/universal_name_test.cc
@@ -17,7 +17,7 @@
 #include <thrift/common/universal_name.h>
 
 #include <regex>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

diff --git a/thrift/common/tree_printer.h b/thrift/common/tree_printer.h
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace apache::thrift::tree_printer {
 

diff --git a/thrift/common/universal_name.cc b/thrift/common/universal_name.cc
@@ -19,7 +19,6 @@
 #include <cctype>
 #include <stdexcept>
 #include <boost/container/small_vector.hpp>
-#include <fmt/core.h>
 #include <fmt/format.h>
 
 namespace apache::thrift {

diff --git a/thrift/compiler/ast/scope_identifier.cc b/thrift/compiler/ast/scope_identifier.cc
@@ -15,7 +15,7 @@
  */
 
 #include <cassert>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/scope_identifier.h>
 

diff --git a/thrift/compiler/ast/t_const.cc b/thrift/compiler/ast/t_const.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_const.h>
 #include <thrift/compiler/ast/t_const_value.h>
 

diff --git a/thrift/compiler/ast/t_include.h b/thrift/compiler/ast/t_include.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_node.h>
 
 namespace apache::thrift::compiler {

diff --git a/thrift/compiler/ast/t_named.cc b/thrift/compiler/ast/t_named.cc
@@ -21,7 +21,7 @@
 #include <thrift/compiler/ast/t_type.h>
 #include <thrift/compiler/ast/uri.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace apache::thrift::compiler {
 

diff --git a/thrift/compiler/ast/t_program.h b/thrift/compiler/ast/t_program.h
@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/node_list.h>
 #include <thrift/compiler/ast/program_scope.h>

diff --git a/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc b/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc
@@ -17,7 +17,7 @@
 #include "thrift/compiler/ast/thrift_ast_debug_tree_utils.h"
 
 #include <string>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "thrift/common/tree_printer.h"
 #include "thrift/compiler/ast/t_program_bundle.h"

diff --git a/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc b/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc
@@ -18,7 +18,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_program_bundle.h>

diff --git a/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc b/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc
@@ -16,7 +16,7 @@
 
 #include <optional>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_map.h>
 #include <thrift/compiler/ast/t_program_bundle.h>

diff --git a/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc b/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_program_bundle.h>
 #include <thrift/compiler/ast/t_struct.h>

diff --git a/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc b/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_program_bundle.h>
 #include <thrift/compiler/ast/t_struct.h>

diff --git a/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc b/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_program_bundle.h>
 #include <thrift/compiler/ast/t_struct.h>

diff --git a/thrift/compiler/codemod/annotate_required_fields.cc b/thrift/compiler/codemod/annotate_required_fields.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/ast/t_program_bundle.h>
 #include <thrift/compiler/ast/t_struct.h>

diff --git a/thrift/compiler/codemod/codemod.cc b/thrift/compiler/codemod/codemod.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/codemod/codemod.h>
 #include <thrift/compiler/compiler.h>
 #include <thrift/compiler/parse/parse_ast.h>

diff --git a/thrift/compiler/codemod/file_manager.cc b/thrift/compiler/codemod/file_manager.cc
@@ -15,7 +15,7 @@
  */
 
 #include <string>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 #include <folly/FileUtil.h>
 

diff --git a/thrift/compiler/codemod/file_manager.h b/thrift/compiler/codemod/file_manager.h
@@ -20,7 +20,7 @@
 #include <optional>
 #include <set>
 #include <unordered_set>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <folly/FileUtil.h>
 

diff --git a/thrift/compiler/codemod/migrate_php_namespace_to_hack_name_prefix.cc b/thrift/compiler/codemod/migrate_php_namespace_to_hack_name_prefix.cc
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/ast/t_program_bundle.h>

diff --git a/thrift/compiler/codemod/package_generator.h b/thrift/compiler/codemod/package_generator.h
@@ -21,7 +21,6 @@
 #include <utility>
 
 #include <boost/algorithm/string.hpp>
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <re2/re2.h>
 #include <thrift/compiler/ast/t_program.h>

diff --git a/thrift/compiler/codemod/relative_include.cc b/thrift/compiler/codemod/relative_include.cc
@@ -18,7 +18,7 @@
 #include <set>
 #include <string>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_include.h>
 #include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/ast/uri.h>

diff --git a/thrift/compiler/codemod/remove_duplicate_namespaces.cc b/thrift/compiler/codemod/remove_duplicate_namespaces.cc
@@ -16,7 +16,7 @@
 
 #include <set>
 #include <string>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/ast/t_program_bundle.h>
 #include <thrift/compiler/codemod/codemod.h>

diff --git a/thrift/compiler/codemod/specify_implicit_field_id.cc b/thrift/compiler/codemod/specify_implicit_field_id.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/codemod/codemod.h>

diff --git a/thrift/compiler/codemod/specify_implicit_func_param_id.cc b/thrift/compiler/codemod/specify_implicit_func_param_id.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/ast_visitor.h>
 #include <thrift/compiler/codemod/codemod.h>

diff --git a/thrift/compiler/codemod/structure_annotations.cc b/thrift/compiler/codemod/structure_annotations.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <range/v3/view.hpp>
 
 #include <thrift/compiler/ast/ast_visitor.h>

diff --git a/thrift/compiler/diagnostic.h b/thrift/compiler/diagnostic.h
@@ -27,7 +27,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ranges.h>
 #include <thrift/compiler/detail/pluggable_functions.h>
 #include <thrift/compiler/metrics/metrics.h>

diff --git a/thrift/compiler/generate/cpp/orderable_type_utils.cc b/thrift/compiler/generate/cpp/orderable_type_utils.cc
@@ -16,7 +16,7 @@
 
 #include <unordered_set>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/ast/t_structured.h>
 #include <thrift/compiler/ast/uri.h>

diff --git a/thrift/compiler/generate/cpp/util.cc b/thrift/compiler/generate/cpp/util.cc
@@ -25,7 +25,7 @@
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/t_field.h>
 #include <thrift/compiler/ast/t_list.h>

diff --git a/thrift/compiler/generate/csharp/util.cc b/thrift/compiler/generate/csharp/util.cc
@@ -16,7 +16,7 @@
 
 #include <thrift/compiler/generate/csharp/util.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_container.h>
 #include <thrift/compiler/ast/t_primitive_type.h>
 #include <thrift/compiler/ast/t_structured.h>

diff --git a/thrift/compiler/generate/go/util.cc b/thrift/compiler/generate/go/util.cc
@@ -17,7 +17,7 @@
 #include <cctype>
 #include <utility>
 #include <boost/algorithm/string.hpp>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <thrift/compiler/ast/t_type.h>
 #include <thrift/compiler/generate/go/util.h>
 

diff --git a/thrift/compiler/generate/json.cc b/thrift/compiler/generate/json.cc
@@ -17,7 +17,7 @@
 #include <thrift/compiler/ast/t_const_value.h>
 #include <thrift/compiler/generate/json.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <cstdint>

diff --git a/thrift/compiler/generate/schema_populator.cc b/thrift/compiler/generate/schema_populator.cc
@@ -19,7 +19,7 @@
 #include <string>
 #include <type_traits>
 #include <utility>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <folly/io/IOBuf.h>
 
 #include <thrift/compiler/ast/t_const.h>

diff --git a/thrift/compiler/generate/t_generator.cc b/thrift/compiler/generate/t_generator.cc
@@ -19,7 +19,7 @@
 #include <stdexcept>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace apache::thrift::compiler {
 

diff --git a/thrift/compiler/generate/t_mstch_cpp2_generator.cc b/thrift/compiler/generate/t_mstch_cpp2_generator.cc
@@ -24,7 +24,7 @@
 #include <vector>
 
 #include <boost/algorithm/string/split.hpp>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/ast/t_const.h>
 #include <thrift/compiler/ast/t_field.h>

diff --git a/thrift/compiler/generate/t_mstch_java_generator.cc b/thrift/compiler/generate/t_mstch_java_generator.cc
@@ -24,7 +24,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <openssl/evp.h>
 #include <thrift/compiler/ast/t_typedef.h>

diff --git a/thrift/compiler/parse/lexer.h b/thrift/compiler/parse/lexer.h
@@ -19,7 +19,7 @@
 #include <functional>
 #include <optional>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <thrift/compiler/parse/token.h>
 #include <thrift/compiler/source_location.h>

diff --git a/thrift/compiler/parse/token.cc b/thrift/compiler/parse/token.cc
@@ -16,7 +16,7 @@
 
 #include <thrift/compiler/parse/token.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <cassert>

diff --git a/thrift/compiler/sema/schematizer.cc b/thrift/compiler/sema/schematizer.cc
@@ -19,7 +19,7 @@
 #include <filesystem>
 #include <string>
 #include <string_view>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 #include <openssl/sha.h>

diff --git a/thrift/compiler/source_location.cc b/thrift/compiler/source_location.cc
@@ -17,7 +17,7 @@
 #include <thrift/compiler/detail/system.h>
 #include <thrift/compiler/source_location.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/std.h>
 
 #include <algorithm>

diff --git a/thrift/compiler/test/token_test.cc b/thrift/compiler/test/token_test.cc
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <thrift/compiler/parse/token.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 using namespace apache::thrift::compiler; // NOLINT
 

diff --git a/thrift/compiler/whisker/ast.cc b/thrift/compiler/whisker/ast.cc
@@ -18,7 +18,7 @@
 #include <thrift/compiler/whisker/detail/overload.h>
 #include <thrift/compiler/whisker/detail/string.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include <cassert>

diff --git a/thrift/compiler/whisker/dsl.h b/thrift/compiler/whisker/dsl.h
@@ -20,7 +20,7 @@
 #include <thrift/compiler/whisker/managed_ptr.h>
 #include <thrift/compiler/whisker/object.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <concepts>

diff --git a/thrift/compiler/whisker/eval_context.cc b/thrift/compiler/whisker/eval_context.cc
@@ -20,7 +20,7 @@
 #include <iterator>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace w = whisker::make;
 

diff --git a/thrift/compiler/whisker/lexer.h b/thrift/compiler/whisker/lexer.h
@@ -27,7 +27,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace whisker {