Rename the old Fn/FnMut/FnOnce to BoxFn/BoxFnMut/BoxFnOnce

Author: danakj

subdoc/lib/database.h

@@ -145,7 +145,7 @@ struct FunctionElement : public CommentElement {
       return sus::none();
   }
 
-  void for_each_comment(sus::fn::FnMut<void(Comment&)>& fn) { fn(comment); }
+  void for_each_comment(sus::fn::BoxFnMut<void(Comment&)>& fn) { fn(comment); }
 };
 
 struct FieldElement : public CommentElement {
@@ -186,7 +186,7 @@ struct FieldElement : public CommentElement {
       return sus::none();
   }
 
-  void for_each_comment(sus::fn::FnMut<void(Comment&)>& fn) { fn(comment); }
+  void for_each_comment(sus::fn::BoxFnMut<void(Comment&)>& fn) { fn(comment); }
 };
 
 struct NamespaceId {
@@ -323,7 +323,7 @@ struct RecordElement : public TypeElement {
     return out;
   }
 
-  void for_each_comment(sus::fn::FnMut<void(Comment&)>& fn) {
+  void for_each_comment(sus::fn::BoxFnMut<void(Comment&)>& fn) {
     fn(comment);
     for (auto& [k, e] : records) e.for_each_comment(fn);
     for (auto& [k, e] : fields) e.for_each_comment(fn);
@@ -426,7 +426,7 @@ struct NamespaceElement : public CommentElement {
     return out;
   }
 
-  void for_each_comment(sus::fn::FnMut<void(Comment&)>& fn) {
+  void for_each_comment(sus::fn::BoxFnMut<void(Comment&)>& fn) {
     fn(comment);
     for (auto& [k, e] : namespaces) e.for_each_comment(fn);
     for (auto& [k, e] : records) e.for_each_comment(fn);
@@ -461,7 +461,7 @@ struct Database {
     sus::Vec<Comment*> to_resolve;
     {
       sus::Vec<Comment*>* to_resolve_ptr = &to_resolve;
-      sus::fn::FnMut<void(Comment&)> fn = sus_bind_mut(
+      sus::fn::BoxFnMut<void(Comment&)> fn = sus_bind_mut(
           sus_store(sus_unsafe_pointer(to_resolve_ptr)), [&](Comment& c) {
             if (c.attrs.inherit.is_some()) {
               to_resolve_ptr->push(&c);

subdoc/lib/run_options.h

@@ -38,7 +38,7 @@ struct RunOptions {
     exclude_path_patterns = sus::move(r);
     return sus::move(*this);
   }
-  RunOptions set_on_tu_complete(sus::fn::Fn<void(clang::ASTContext&)> fn) && {
+  RunOptions set_on_tu_complete(sus::fn::BoxFn<void(clang::ASTContext&)> fn) && {
     on_tu_complete = sus::some(sus::move(fn));
     return sus::move(*this);
   }
@@ -53,7 +53,7 @@ struct RunOptions {
   ///
   /// Used for tests to observe the AST and test subdoc methods that act on
   /// things from the AST.
-  sus::Option<sus::fn::Fn<void(clang::ASTContext&)>> on_tu_complete;
+  sus::Option<sus::fn::BoxFn<void(clang::ASTContext&)>> on_tu_complete;
 };
 
 }  // namespace subdoc

subspace/CMakeLists.txt

@@ -45,12 +45,12 @@ target_sources(subspace PUBLIC
     "containers/array.h"
     "containers/slice.h"
     "containers/vec.h"
-    "fn/__private/fn_storage.h"
+    "fn/__private/box_fn_storage.h"
     "fn/callable.h"
     "fn/fn.h"
-    "fn/fn_bind.h"
-    "fn/fn_defn.h"
-    "fn/fn_impl.h"
+    "fn/bind.h"
+    "fn/box_fn_defn.h"
+    "fn/box_fn_impl.h"
     "fn/stackfn_defn.h"
     "iter/__private/into_iterator_archetype.h"
     "iter/__private/iterator_end.h"
@@ -151,7 +151,7 @@ add_executable(subspace_unittests
     "construct/from_unittest.cc"
     "construct/into_unittest.cc"
     "construct/default_unittest.cc"
-    "fn/fn_unittest.cc"
+    "fn/box_fn_unittest.cc"
     "fn/stackfn_unittest.cc"
     "iter/iterator_unittest.cc"
     "mem/addressof_unittest.cc"

subspace/containers/array.h

@@ -27,7 +27,7 @@
 #include "subspace/containers/__private/slice_iter.h"
 #include "subspace/containers/slice.h"
 #include "subspace/fn/callable.h"
-#include "subspace/fn/fn_defn.h"
+#include "subspace/fn/box_fn_defn.h"
 #include "subspace/macros/compiler.h"
 #include "subspace/marker/unsafe.h"
 #include "subspace/mem/clone.h"

subspace/fn/__private/fn_storage.h renamed to subspace/fn/__private/box_fn_storage.h

@@ -18,40 +18,40 @@
 
 namespace sus::fn::__private {
 
-struct FnStorageVtableBase {};
+struct BoxFnStorageVtableBase {};
 
-struct FnStorageBase {
+struct BoxFnStorageBase {
   // Should be to a static lifetime pointee.
-  Option<const FnStorageVtableBase&> vtable = Option<const FnStorageVtableBase&>::none();
+  Option<const BoxFnStorageVtableBase&> vtable = Option<const BoxFnStorageVtableBase&>::none();
 };
 
 template <class R, class... CallArgs>
-struct FnStorageVtable final : public FnStorageVtableBase {
-  R (*call_once)(__private::FnStorageBase&&, CallArgs...);
-  R (*call_mut)(__private::FnStorageBase&, CallArgs...);
-  R (*call)(const __private::FnStorageBase&, CallArgs...);
+struct BoxFnStorageVtable final : public BoxFnStorageVtableBase {
+  R (*call_once)(__private::BoxFnStorageBase&&, CallArgs...);
+  R (*call_mut)(__private::BoxFnStorageBase&, CallArgs...);
+  R (*call)(const __private::BoxFnStorageBase&, CallArgs...);
 };
 
 template <class F>
-class FnStorage final : public FnStorageBase {
+class BoxFnStorage final : public BoxFnStorageBase {
  public:
-  constexpr FnStorage(F&& callable) : callable_(::sus::move(callable)) {}
+  constexpr BoxFnStorage(F&& callable) : callable_(::sus::move(callable)) {}
 
   template <class R, class... CallArgs>
-  static R call(const FnStorageBase& self_base, CallArgs... callargs) {
-    const auto& self = static_cast<const FnStorage&>(self_base);
+  static R call(const BoxFnStorageBase& self_base, CallArgs... callargs) {
+    const auto& self = static_cast<const BoxFnStorage&>(self_base);
     return self.callable_(forward<CallArgs>(callargs)...);
   }
 
   template <class R, class... CallArgs>
-  static R call_mut(FnStorageBase& self_base, CallArgs... callargs) {
-    auto& self = static_cast<FnStorage&>(self_base);
+  static R call_mut(BoxFnStorageBase& self_base, CallArgs... callargs) {
+    auto& self = static_cast<BoxFnStorage&>(self_base);
     return self.callable_(forward<CallArgs>(callargs)...);
   }
 
   template <class R, class... CallArgs>
-  static R call_once(FnStorageBase&& self_base, CallArgs... callargs) {
-    auto&& self = static_cast<FnStorage&&>(self_base);
+  static R call_once(BoxFnStorageBase&& self_base, CallArgs... callargs) {
+    auto&& self = static_cast<BoxFnStorage&&>(self_base);
     return ::sus::move(self.callable_)(forward<CallArgs>(callargs)...);
   }
 

subspace/fn/fn_bind.h renamed to subspace/fn/bind.h

@@ -17,7 +17,7 @@
 #include <type_traits>
 
 #include "subspace/fn/callable.h"
-#include "subspace/fn/fn_defn.h"
+#include "subspace/fn/box_fn_defn.h"
 #include "subspace/macros/__private/compiler_bugs.h"
 #include "subspace/macros/eval_macro.h"
 #include "subspace/macros/for_each.h"