Address clang-tidy feedback

jank-lang · Dec 10, 2024 · aeed354 · aeed354
1 parent c6348e8
commit aeed354
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -33,6 +33,7 @@ misc-definitions-in-headers,\
 -cppcoreguidelines-rvalue-reference-param-not-moved,\
 -bugprone-easily-swappable-parameters,\
 -bugprone-reserved-identifier,\
+-bugprone-multi-level-implicit-pointer-conversion,\
 -readability-redundant-member-init,\
 -readability-implicit-bool-conversion,\
 -readability-magic-numbers,\

diff --git a/compiler+runtime/include/cpp/jank/c_api.h b/compiler+runtime/include/cpp/jank/c_api.h
@@ -255,7 +255,8 @@ extern "C"
   void jank_set_meta(jank_object_ptr o, jank_object_ptr meta);
 
   void jank_throw(jank_object_ptr o);
-  jank_object_ptr jank_try(jank_object_ptr body, jank_object_ptr catch_, jank_object_ptr finally);
+  jank_object_ptr
+  jank_try(jank_object_ptr try_fn, jank_object_ptr catch_fn, jank_object_ptr finally_fn);
 
   void jank_profile_enter(char const *label);
   void jank_profile_exit(char const *label);

diff --git a/compiler+runtime/include/cpp/jank/option.hpp b/compiler+runtime/include/cpp/jank/option.hpp
@@ -24,6 +24,7 @@ namespace jank
   template <typename T>
   struct option
   {
+    /* NOLINTNEXTLINE(bugprone-sizeof-expression): Safe to do this. */
     using storage_type = char[sizeof(T)];
     using value_type = T;
 
@@ -203,7 +204,7 @@ namespace jank
     }
 
     template <typename F>
-    constexpr auto map(F &&f) const -> option<decltype(f(std::declval<T>()))>
+    constexpr auto map(F const &f) const -> option<decltype(f(std::declval<T>()))>
     {
       if(set)
       {
@@ -213,7 +214,7 @@ namespace jank
     }
 
     template <typename F>
-    constexpr T map_or(T fallback, F &&f) const
+    constexpr T map_or(T fallback, F const &f) const
     {
       if(set)
       {