Update to latest fmt

madeso · Mar 13, 2024 · 33a2e4f · 33a2e4f
1 parent 2965c32
commit 33a2e4f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/external/catchy b/external/catchy
diff --git a/libs/api/src/api/image.cc b/libs/api/src/api/image.cc
@@ -53,8 +53,8 @@ void Image::set_color(int x, int y, const Color& c)
 
 Color Image::get_color(int x, int y) const
 {
-    XASSERT(x >= 0 && x < width, "{} {}"_format(x, width));
-    XASSERT(y >= 0 && y < height, "{} {}"_format(y, height));
+    XASSERT(x >= 0 && x < width, fmt::format("{} {}", x, width));
+    XASSERT(y >= 0 && y < height, fmt::format("{} {}", y, height));
     const auto index = (x + y * width) * 4;
     return Color::rgb
     (

diff --git a/libs/backends/sdl_base/src/backend/log.h b/libs/backends/sdl_base/src/backend/log.h
@@ -17,19 +17,19 @@ log_warning_implementation(fmt::string_view format, fmt::format_args args);
 template <typename S, typename... Args>
 void
 log_info(const S& format, Args&&... args) {
-    log_info_implementation(format, fmt::make_args_checked<Args...>(format, args...));
+    log_info_implementation(format, fmt::make_format_args(format, args...));
 }
 
 template <typename S, typename... Args>
 void
 log_error(const S& format, Args&&... args) {
-    log_error_implementation(format, fmt::make_args_checked<Args...>(format, args...));
+    log_error_implementation(format, fmt::make_format_args(format, args...));
 }
 
 template <typename S, typename... Args>
 void
 log_warning(const S& format, Args&&... args) {
-    log_warning_implementation(format, fmt::make_args_checked<Args...>(format, args...));
+    log_warning_implementation(format, fmt::make_format_args(format, args...));
 }
 
 

diff --git a/libs/core/src/core/rect.h b/libs/core/src/core/rect.h
@@ -170,13 +170,13 @@ struct Rect
 
     static Self from_ltrb(T left, T top, T right, T bottom)
     {
-        XASSERT(left <= right && top >= bottom, "{} <= {} && {} >= {}"_format(left, right, top, bottom));
+        XASSERT(left <= right && top >= bottom, fmt::format("{} <= {} && {} >= {}", left, right, top, bottom));
         return {left, bottom, right - left, top-bottom};
     }
 
     static Self from_lrtb(T left, T right, T top, T bottom)
     {
-        XASSERT(left <= right && top >= bottom, "{} <= {} && {} >= {}"_format(left, right, top, bottom));
+        XASSERT(left <= right && top >= bottom, fmt::format("{} <= {} && {} >= {}", left, right, top, bottom));
         return {left, bottom, right - left, top-bottom};
     }
 

diff --git a/libs/ride/src/ride/view.document.cc b/libs/ride/src/ride/view.document.cc
@@ -104,7 +104,7 @@ void ViewDoc::draw_line(api::Renderer* cache, std::size_t line_index, const Dp&,
     font->draw
     (
         cache,
-        "{0: >{1}}"_format(line_index+1, gutter_char_length),
+        fmt::format("{0: >{1}}", line_index+1, gutter_char_length),
         app->Cpx(gutter_rect.x + theme->gutter_spacing_left),
         app->Cpx(y),
         theme->gutter_color
@@ -288,7 +288,7 @@ void ViewDoc::draw_body(api::Renderer* cache)
 
     // const auto line = absolute_pix_y_to_line(last_mouse.y);
     // const auto offset = absolute_pix_x_to_offset(line, last_mouse.x);
-    // draw_text(cache, font, "{} {}: {}"_format(line+1, offset, last_mouse), app->Cpx(view_rect.x + 10_dp), app->Cpx(view_rect.y + 10_dp), {0,0,0});
+    // draw_text(cache, font, fmt::format("{} {}: {}", line+1, offset, last_mouse), app->Cpx(view_rect.x + 10_dp), app->Cpx(view_rect.y + 10_dp), {0,0,0});
 }