From c4ba2b0f2e4f5f56ba21f283ddf437b40b9dddad Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 20 Jun 2017 14:22:49 -0700 Subject: [PATCH] rename InstancePtr to AsPyRef --- src/callback.rs | 2 +- src/class/basic.rs | 2 +- src/class/gc.rs | 2 +- src/class/macros.rs | 18 +++++++++--------- src/lib.rs | 2 +- src/token.rs | 5 ++--- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/callback.rs b/src/callback.rs index 208df3cd..5e01012b 100644 --- a/src/callback.rs +++ b/src/callback.rs @@ -9,7 +9,7 @@ use objects::exc; use conversion::IntoPyObject; use ffi::{self, Py_hash_t}; use err::{PyErr, PyResult}; -use token::{Py, InstancePtr}; +use token::{Py, AsPyRef}; use typeob::PyTypeInfo; diff --git a/src/class/basic.rs b/src/class/basic.rs index 8dbde5b2..374c1bfc 100644 --- a/src/class/basic.rs +++ b/src/class/basic.rs @@ -15,7 +15,7 @@ use err::{PyErr, PyResult}; use python::{Python, IntoPyPointer}; use objects::PyObject; use objects::exc; -use token::{Py, InstancePtr}; +use token::{Py, AsPyRef}; use typeob::PyTypeInfo; use conversion::{FromPyObject, IntoPyObject}; use callback::{PyObjectCallbackConverter, HashConverter, BoolCallbackConverter}; diff --git a/src/class/gc.rs b/src/class/gc.rs index 524fbcf4..38cd41fa 100644 --- a/src/class/gc.rs +++ b/src/class/gc.rs @@ -9,7 +9,7 @@ use std::os::raw::{c_int, c_void}; use ffi; use python::{Python, ToPyPointer}; use callback::AbortOnDrop; -use token::{Py, InstancePtr}; +use token::{Py, AsPyRef}; use typeob::PyTypeInfo; pub struct PyTraverseError(c_int); diff --git a/src/class/macros.rs b/src/class/macros.rs index cd5cdeda..1de95c06 100644 --- a/src/class/macros.rs +++ b/src/class/macros.rs @@ -10,7 +10,7 @@ macro_rules! py_unary_func { unsafe extern "C" fn wrap(slf: *mut $crate::ffi::PyObject) -> $ret_type where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, $res_type>(LOCATION, $conv, |py| { @@ -35,7 +35,7 @@ macro_rules! py_unary_func { -> *mut $crate::ffi::PyObject where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, $res_type>(LOCATION, $conv, |py| { @@ -82,7 +82,7 @@ macro_rules! py_binary_func{ arg: *mut ffi::PyObject) -> $return where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, $res_type>(LOCATION, $conv, |py| { @@ -116,7 +116,7 @@ macro_rules! py_binary_self_func{ arg: *mut ffi::PyObject) -> *mut $crate::ffi::PyObject where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_meth(LOCATION, |py| { @@ -161,7 +161,7 @@ macro_rules! py_ssizearg_func { arg: $crate::Py_ssize_t) -> *mut $crate::ffi::PyObject where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_meth(LOCATION, |py| { @@ -190,7 +190,7 @@ macro_rules! py_ternary_func{ arg2: *mut $crate::ffi::PyObject) -> $return_type where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, $res_type>(LOCATION, $conv, |py| { @@ -229,7 +229,7 @@ macro_rules! py_ternary_self_func{ -> *mut $crate::ffi::PyObject where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_meth(LOCATION, |py| { @@ -323,7 +323,7 @@ macro_rules! py_func_del{ value: *mut $crate::ffi::PyObject) -> $crate::c_int where T: for<'p> $trait<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, ()>( @@ -375,7 +375,7 @@ macro_rules! py_func_set_del{ value: *mut $crate::ffi::PyObject) -> $crate::c_int where T: for<'p> $trait<'p> + for<'p> $trait2<'p> { - use token::InstancePtr; + use token::AsPyRef; const LOCATION: &'static str = concat!(stringify!($class), ".", stringify!($f), "()"); $crate::callback::cb_pyfunc::<_, _, ()>( diff --git a/src/lib.rs b/src/lib.rs index beee8442..4cdfb494 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -157,7 +157,7 @@ mod pointers; pub use pointers::PyPtr; pub mod token; -pub use token::{PyToken, PyObjectWithToken, InstancePtr, Py}; +pub use token::{PyToken, PyObjectWithToken, Py, AsPyRef}; pub use err::{PyErr, PyResult, PyDowncastError, ToPyErr}; pub use objects::*; diff --git a/src/token.rs b/src/token.rs index 5c6a0237..538cfcfd 100644 --- a/src/token.rs +++ b/src/token.rs @@ -24,7 +24,7 @@ pub trait PyObjectWithToken : Sized { fn token(&self) -> Python; } -pub trait InstancePtr : Sized { +pub trait AsPyRef : Sized { fn as_ref(&self, py: Python) -> &T; @@ -176,7 +176,7 @@ impl Py where T: PyTypeInfo, } } -impl InstancePtr for Py where T: PyTypeInfo { +impl AsPyRef for Py where T: PyTypeInfo { #[inline] fn as_ref(&self, _py: Python) -> &T { @@ -202,7 +202,6 @@ impl ToPyObject for Py { } } - impl IntoPyObject for Py { /// Converts `Py` instance -> PyObject. /// Consumes `self` without calling `Py_DECREF()`