Simplify default fallthrough

Author: ijl

src/serialize/default.rs

@@ -56,16 +56,11 @@ impl<'p> Serialize for DefaultSerializer {
                     self.ptr,
                     std::ptr::null_mut() as *mut pyo3::ffi::PyObject
                 ));
-                if default_obj.is_null() {
+                if unlikely!(default_obj.is_null()) {
                     err!(format_args!(
                         "Type is not JSON serializable: {}",
                         obj_name!(ob_type!(self.ptr))
                     ))
-                } else if !ffi!(PyErr_Occurred()).is_null() {
-                    err!(format_args!(
-                        "Type raised exception in default function: {}",
-                        obj_name!(ob_type!(self.ptr))
-                    ))
                 } else {
                     let res = SerializePyObject::new(
                         default_obj,

src/serialize/uuid.rs

@@ -27,7 +27,7 @@ impl UUID {
                 // test_uuid_overflow
                 pyo3::ffi::_PyLong_AsByteArray(
                     py_int as *mut pyo3::ffi::PyLongObject,
-                    buffer.as_ptr() as *const c_uchar,
+                    buffer.as_ptr() as *mut c_uchar,
                     16,
                     1, // little_endian
                     0, // is_signed

test/requirements.txt

@@ -1,7 +1,7 @@
 arrow
 dataclasses;python_version<"3.7"
 numpy;platform_machine=="x86_64" and python_version<"3.9"
-pendulum;sys_platform=="linux" and python_version<"3.9" and platform_machine=="x86_64"
+pendulum;sys_platform=="linux" and platform_machine=="x86_64"
 psutil
 pytest
 pytz

test/test_default.py

@@ -26,6 +26,10 @@ def default(obj):
     return obj.cur
 
 
+def default_raises(obj):
+    raise TypeError
+
+
 class TypeTests(unittest.TestCase):
     def test_default_not_callable(self):
         """
@@ -95,6 +99,15 @@ def default(obj):
             ran = True
         self.assertTrue(ran)
 
+    def test_default_exception_type(self):
+        """
+        dumps() TypeError in default() raises orjson.JSONEncodeError
+        """
+        ref = Custom()
+
+        with self.assertRaises(orjson.JSONEncodeError):
+            orjson.dumps(ref, default=default_raises)
+
     def test_default_func_nested_str(self):
         """
         dumps() default function nested str