luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use AsRef/AsMut instead of as_super/as_super_mut

This commit is contained in:
kngwyu 2020-02-21 20:37:35 +09:00
parent 1f5cb83ef8
commit 3d0ee2a28d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guide/src/class.md
View File

@ -281,7 +281,7 @@ impl SubClass {
} }
fn method2(self_: PyRef<Self>) -> PyResult<usize> { fn method2(self_: PyRef<Self>) -> PyResult<usize> {
let super_ = self_.as_super(); // Get &BaseClass let super_ = self_.as_ref(); // Get &BaseClass
super_.method().map(|x| x * self_.val2) super_.method().map(|x| x * self_.val2)
} }
} }

16
src/pycell.rs
View File

@ -258,11 +258,8 @@ pub struct PyRef<'p, T: PyClass> {
inner: &'p PyCellInner<T>, inner: &'p PyCellInner<T>,
} }
impl<'p, T> PyRef<'p, T> impl<'p, T: PyClass> AsRef<T::BaseType> for PyRef<'p, T> {
where fn as_ref(&self) -> &T::BaseType {
T: PyClass,
{
pub fn as_super(&self) -> &T::BaseType {
unsafe { self.inner.ob_base.unchecked_ref() } unsafe { self.inner.ob_base.unchecked_ref() }
} }
} }
@ -326,11 +323,14 @@ pub struct PyRefMut<'p, T: PyClass> {
inner: &'p PyCellInner<T>, inner: &'p PyCellInner<T>,
} }
impl<'p, T: PyClass> PyRefMut<'p, T> { impl<'p, T: PyClass> AsRef<T::BaseType> for PyRefMut<'p, T> {
pub fn as_super(&self) -> &T::BaseType { fn as_ref(&self) -> &T::BaseType {
unsafe { self.inner.ob_base.unchecked_ref() } unsafe { self.inner.ob_base.unchecked_ref() }
} }
pub fn as_super_mut(&mut self) -> &mut T::BaseType { }
impl<'p, T: PyClass> AsMut<T::BaseType> for PyRefMut<'p, T> {
fn as_mut(&mut self) -> &mut T::BaseType {
unsafe { self.inner.ob_base.unchecked_mut() } unsafe { self.inner.ob_base.unchecked_mut() }
} }
} }

2
tests/test_gc.rs
View File

@ -268,7 +268,7 @@ fn inheritance_with_new_methods_with_drop() {
let obj: &PyCell<SubClassWithDrop> = inst.try_into().unwrap(); let obj: &PyCell<SubClassWithDrop> = inst.try_into().unwrap();
let mut obj_ref_mut = obj.borrow_mut(); let mut obj_ref_mut = obj.borrow_mut();
obj_ref_mut.data = Some(Arc::clone(&drop_called1)); obj_ref_mut.data = Some(Arc::clone(&drop_called1));
obj_ref_mut.as_super_mut().data = Some(Arc::clone(&drop_called2)); obj_ref_mut.as_mut().data = Some(Arc::clone(&drop_called2));
} }
assert!(drop_called1.load(Ordering::Relaxed)); assert!(drop_called1.load(Ordering::Relaxed));