refactor: move nanobind imports to common header

Author: shiftinv

src/binding_core.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <nanobind/nanobind.h>
+#include <nanobind/stl/chrono.h>
+#include <nanobind/stl/function.h>
+#include <nanobind/stl/map.h>
+#include <nanobind/stl/optional.h>
+#include <nanobind/stl/set.h>
+#include <nanobind/stl/shared_ptr.h>
+#include <nanobind/stl/string.h>
+#include <nanobind/stl/unique_ptr.h>
+#include <nanobind/stl/variant.h>
+#include <nanobind/stl/vector.h>
+
+namespace nb = nanobind;
+
+namespace dave = discord::dave;

src/dave.cpp

@@ -1,11 +1,8 @@
 #include <dave/common.h>
-#include <nanobind/nanobind.h>
 
+#include "binding_core.hpp"
 #include "logging.hpp"
 
-namespace nb = nanobind;
-namespace dave = discord::dave;
-
 // since these are all (mostly) self-contained bindings,
 // just forward-declare these functions instead of writing headers for everything
 void bindDecryptor(nb::module_& m);

src/decryptor.cpp

@@ -1,12 +1,7 @@
 #include <dave/decryptor.h>
 #include <dave/logger.h>
-#include <nanobind/nanobind.h>
-#include <nanobind/stl/chrono.h>
-#include <nanobind/stl/optional.h>
-#include <nanobind/stl/unique_ptr.h>
 
-namespace nb = nanobind;
-namespace dave = discord::dave;
+#include "binding_core.hpp"
 
 class DecryptorWrapper {
 private:

src/encryptor.cpp

@@ -1,12 +1,7 @@
 #include <dave/encryptor.h>
 #include <dave/logger.h>
-#include <nanobind/nanobind.h>
-#include <nanobind/stl/function.h>
-#include <nanobind/stl/optional.h>
-#include <nanobind/stl/unique_ptr.h>
 
-namespace nb = nanobind;
-namespace dave = discord::dave;
+#include "binding_core.hpp"
 
 class EncryptorWrapper {
 private:

src/logging.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <dave/logger.h>
-#include <nanobind/nanobind.h>
-#include <nanobind/stl/string.h>
+
+#include "binding_core.hpp"
 
 namespace nb = nanobind;
 

src/session.cpp

@@ -1,21 +1,9 @@
 #include <dave/mls/session.h>
-#include <nanobind/nanobind.h>
-#include <nanobind/stl/function.h>
-#include <nanobind/stl/map.h>
-#include <nanobind/stl/optional.h>
-#include <nanobind/stl/set.h>
-#include <nanobind/stl/shared_ptr.h>
-#include <nanobind/stl/string.h>
-#include <nanobind/stl/unique_ptr.h>
-#include <nanobind/stl/variant.h>
-#include <nanobind/stl/vector.h>
 
+#include "binding_core.hpp"
 #include "signature_key_pair.hpp"
 #include "utils.hpp"
 
-namespace nb = nanobind;
-namespace dave = discord::dave;
-
 // used instead of std::variant for hard-/soft-rejecting messages
 enum RejectType : uint8_t {
     Failed,  // dave::failed_t

src/signature_key_pair.cpp

@@ -1,10 +1,8 @@
 #include "signature_key_pair.hpp"
 
 #include <dave/mls/parameters.h>
-#include <nanobind/stl/string.h>
 
-namespace nb = nanobind;
-namespace dave = discord::dave;
+#include "binding_core.hpp"
 
 SignatureKeyPair SignatureKeyPair::generate(dave::ProtocolVersion version) {
     auto suite = dave::mls::CiphersuiteForProtocolVersion(version);

src/signature_key_pair.hpp

@@ -1,9 +1,8 @@
 #pragma once
 
 #include <dave/mls/parameters.h>
-#include <nanobind/nanobind.h>
 
-namespace dave = discord::dave;
+#include "binding_core.hpp"
 
 class SignatureKeyPair {
 private:

src/utils.hpp

@@ -1,10 +1,8 @@
 #pragma once
 
-#include <nanobind/nanobind.h>
-
 #include <vector>
 
-namespace nb = nanobind;
+#include "binding_core.hpp"
 
 namespace nanobind {