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

Remove all usages of unguarded

This commit is contained in:
kngwyu 2020-02-22 20:26:11 +09:00
parent c2a40fbf70
commit d3d61c6ad3
3 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/class/basic.rs
View File

@ -507,19 +507,21 @@ where
let slf = py.from_borrowed_ptr::<crate::PyCell<T>>(slf);
let arg = py.from_borrowed_ptr::<PyAny>(arg);
let res = match extract_op(op) {
Ok(op) => match arg.extract() {
Ok(arg) => match slf.try_borrow_unguarded() {
Ok(borrow) => borrow.__richcmp__(arg, op).into(),
Err(e) => Err(e.into()),
},
Err(e) => Err(e),
},
Err(e) => Err(e),
};
match res {
Ok(val) => val.into_py(py).into_ptr(),
Err(e) => e.restore_and_null(py),
match slf.try_borrow() {
Ok(borrowed_slf) => {
let res = match extract_op(op) {
Ok(op) => match arg.extract() {
Ok(arg) => borrowed_slf.__richcmp__(arg, op).into(),
Err(e) => Err(e),
},
Err(e) => Err(e),
};
match res {
Ok(val) => val.into_py(py).into_ptr(),
Err(e) => e.restore_and_null(py),
}
}
Err(e) => PyErr::from(e).restore_and_null(py),
}
}
Some(wrap::<T>)

44
src/class/sequence.rs
View File

@ -264,25 +264,27 @@ mod sq_ass_item_impl {
let _pool = crate::GILPool::new(py);
let slf = py.from_borrowed_ptr::<crate::PyCell<T>>(slf);
let result = if value.is_null() {
Err(PyErr::new::<exceptions::NotImplementedError, _>(format!(
if value.is_null() {
return PyErr::new::<exceptions::NotImplementedError, _>(format!(
"Item deletion is not supported by {:?}",
stringify!(T)
)))
} else {
let value = py.from_borrowed_ptr::<PyAny>(value);
match value.extract() {
Ok(value) => match slf.try_borrow_mut_unguarded() {
Ok(slf_) => slf_.__setitem__(key.into(), value).into(),
Err(e) => e.into(),
},
Err(e) => Err(e),
}
};
))
.restore_and_minus1(py);
}
match result {
Ok(_) => 0,
Err(e) => e.restore_and_minus1(py),
match slf.try_borrow_mut() {
Ok(mut slf) => {
let value = py.from_borrowed_ptr::<PyAny>(value);
let result = match value.extract() {
Ok(value) => slf.__setitem__(key.into(), value).into(),
Err(e) => e.into(),
};
match result {
Ok(_) => 0,
Err(e) => e.restore_and_minus1(py),
}
}
Err(e) => PyErr::from(e).restore_and_minus1(py),
}
}
Some(wrap::<T>)
@ -371,12 +373,12 @@ mod sq_ass_item_impl {
call_mut!(slf, __delitem__; key.into())
} else {
let value = py.from_borrowed_ptr::<PyAny>(value);
match value.extract() {
Ok(value) => match slf.try_borrow_mut_unguarded() {
Ok(slf_) => slf_.__setitem__(key.into(), value).into(),
Err(e) => e.into(),
match slf.try_borrow_mut() {
Ok(mut slf_) => match value.extract() {
Ok(value) => slf_.__setitem__(key.into(), value).into(),
Err(e) => Err(e),
},
Err(e) => Err(e),
Err(e) => Err(e.into()),
}
};
match result {

3
src/conversion.rs
View File

@ -259,8 +259,7 @@ where
{
fn extract(obj: &'a PyAny) -> PyResult<Self> {
let cell: &PyCell<Self> = PyTryFrom::try_from(obj)?;
let ref_ = unsafe { cell.try_borrow_unguarded()? };
Ok(ref_.clone())
Ok(unsafe { cell.try_borrow_unguarded()?.clone() })
}
}