Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-17 01:51:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #730 from RustPython/joey/remove-frompyobjecterf

Browse Source 
Remove FromPyObjectRef, replace with downcast
This commit is contained in:
Joey
2019-03-23 11:05:10 -07:00
committed by GitHub
parent af0194d51e f413beb051
commit 65e00a8f32
5 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vm/src/obj/objint.rs
View File

@@ -7,8 +7,7 @@ use num_traits::{Pow, Signed, ToPrimitive, Zero};
use crate::format::FormatSpec;
use crate::function::{OptionalArg, PyFuncArgs};
use crate::pyobject::{
FromPyObjectRef, IntoPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
TypeProtocol,
IntoPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
};
use crate::vm::VirtualMachine;
@@ -388,7 +387,7 @@ fn int_new(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
None => Zero::zero(),
};
Ok(PyInt::new(val)
.into_ref_with_type(vm, PyClassRef::from_pyobj(cls))?
.into_ref_with_type(vm, cls.clone().downcast().unwrap())?
.into_object())
}

11
vm/src/obj/objtype.rs
View File

@@ -4,8 +4,8 @@ use std::fmt;
use crate::function::{Args, KwArgs, PyFuncArgs};
use crate::pyobject::{
FromPyObjectRef, IdProtocol, PyAttributes, PyContext, PyObject, PyObjectRef, PyRef, PyResult,
PyValue, TypeProtocol,
IdProtocol, PyAttributes, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue,
TypeProtocol,
};
use crate::vm::VirtualMachine;
@@ -236,7 +236,7 @@ pub fn type_new_class(
let mut bases: Vec<PyClassRef> = vm
.extract_elements(bases)?
.iter()
.map(|x| FromPyObjectRef::from_pyobj(x))
.map(|x| x.clone().downcast().unwrap())
.collect();
bases.push(vm.ctx.object());
let name = objstr::get_value(name);
@@ -385,7 +385,6 @@ pub fn new(
#[cfg(test)]
mod tests {
use super::FromPyObjectRef;
use super::{linearise_mro, new};
use super::{HashMap, IdProtocol, PyClassRef, PyContext};
@@ -417,8 +416,8 @@ mod tests {
)
.unwrap();
let a: PyClassRef = FromPyObjectRef::from_pyobj(&a);
let b: PyClassRef = FromPyObjectRef::from_pyobj(&b);
let a: PyClassRef = a.downcast().unwrap();
let b: PyClassRef = b.downcast().unwrap();
assert_eq!(
map_ids(linearise_mro(vec![