From 521db82e93f77c62a835263fbb451b3e698e8ced Mon Sep 17 00:00:00 2001 From: David Hewitt <1939362+davidhewitt@users.noreply.github.com> Date: Sun, 15 Nov 2020 15:19:16 +0000 Subject: [PATCH] use type_check and type_check_exact --- src/conversion.rs | 8 ++++---- src/type_object.rs | 4 ++-- src/types/mod.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conversion.rs b/src/conversion.rs index 529a6c04d3e..1edc8f4762c 100644 --- a/src/conversion.rs +++ b/src/conversion.rs @@ -326,7 +326,7 @@ where fn try_from>(value: V) -> Result<&'v Self, PyDowncastError<'v>> { let value = value.into(); unsafe { - if T::check(value) { + if T::type_check(value) { Ok(Self::try_from_unchecked(value)) } else { Err(PyDowncastError::new(value, T::NAME)) @@ -337,7 +337,7 @@ where fn try_from_exact>(value: V) -> Result<&'v Self, PyDowncastError<'v>> { let value = value.into(); unsafe { - if T::check_exact(value) { + if T::type_check_exact(value) { Ok(Self::try_from_unchecked(value)) } else { Err(PyDowncastError::new(value, T::NAME)) @@ -358,7 +358,7 @@ where fn try_from>(value: V) -> Result<&'v Self, PyDowncastError<'v>> { let value = value.into(); unsafe { - if T::check(value) { + if T::type_check(value) { Ok(Self::try_from_unchecked(value)) } else { Err(PyDowncastError::new(value, T::NAME)) @@ -368,7 +368,7 @@ where fn try_from_exact>(value: V) -> Result<&'v Self, PyDowncastError<'v>> { let value = value.into(); unsafe { - if T::check_exact(value) { + if T::type_check_exact(value) { Ok(Self::try_from_unchecked(value)) } else { Err(PyDowncastError::new(value, T::NAME)) diff --git a/src/type_object.rs b/src/type_object.rs index d4059344137..02a87d78b2d 100644 --- a/src/type_object.rs +++ b/src/type_object.rs @@ -105,12 +105,12 @@ pub unsafe trait PyTypeInfo: Sized { fn type_object_raw(py: Python) -> *mut ffi::PyTypeObject; /// Checks if `object` is an instance of this type or a subclass of this type. - fn check(object: &PyAny) -> bool { + fn type_check(object: &PyAny) -> bool { unsafe { ffi::PyObject_TypeCheck(object.as_ptr(), Self::type_object_raw(object.py())) != 0 } } /// Checks if `object` is an instance of this type. - fn check_exact(object: &PyAny) -> bool { + fn type_check_exact(object: &PyAny) -> bool { unsafe { ffi::Py_TYPE(object.as_ptr()) == Self::type_object_raw(object.py()) } } } diff --git a/src/types/mod.rs b/src/types/mod.rs index 1af1c5405e1..9d353cba1a0 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -184,7 +184,7 @@ macro_rules! pyobject_native_type_convert( } #[allow(unused_unsafe)] - fn check(ptr: &$crate::PyAny) -> bool { + fn type_check(ptr: &$crate::PyAny) -> bool { use $crate::AsPyPointer; unsafe { $checkfunction(ptr.as_ptr()) > 0 } }