remove PyPayload::into_pyresult_with_type

youknowone · youknowone · commit e52a5f99f357 · 2022-04-23T09:47:53.000+09:00
diff --git a/stdlib/src/json.rs b/stdlib/src/json.rs
@@ -60,7 +60,8 @@ mod _json {
                 parse_constant,
                 ctx,
             }
-            .into_pyresult_with_type(vm, cls)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
         }
     }
 
diff --git a/stdlib/src/pystruct.rs b/stdlib/src/pystruct.rs
@@ -250,7 +250,9 @@ pub(crate) mod _struct {
         fn py_new(cls: PyTypeRef, fmt: Self::Args, vm: &VirtualMachine) -> PyResult {
             let spec = fmt.format_spec(vm)?;
             let format = fmt.0;
-            PyStruct { spec, format }.into_pyresult_with_type(vm, cls)
+            PyStruct { spec, format }
+                .into_ref_with_type(vm, cls)
+                .map(Into::into)
         }
     }
 
diff --git a/stdlib/src/random.rs b/stdlib/src/random.rs
@@ -73,7 +73,8 @@ mod _random {
             PyRandom {
                 rng: PyMutex::default(),
             }
-            .into_pyresult_with_type(vm, cls)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
         }
     }
 
diff --git a/stdlib/src/socket.rs b/stdlib/src/socket.rs
@@ -547,7 +547,7 @@ mod _socket {
     impl PySocket {
         #[pyslot]
         fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-            Self::default().into_pyresult_with_type(vm, cls)
+            Self::default().into_ref_with_type(vm, cls).map(Into::into)
         }
 
         #[pymethod(magic)]
diff --git a/stdlib/src/ssl.rs b/stdlib/src/ssl.rs
@@ -489,7 +489,8 @@ mod _ssl {
                 check_hostname: AtomicCell::new(check_hostname),
                 protocol: proto,
             }
-            .into_pyresult_with_type(vm, cls)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
         }
     }
 
diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -100,7 +100,9 @@ pub(crate) fn init(context: &Context) {
 impl PyByteArray {
     #[pyslot]
     fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyByteArray::default().into_pyresult_with_type(vm, cls)
+        PyByteArray::default()
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/builtins/classmethod.rs b/vm/src/builtins/classmethod.rs
@@ -61,7 +61,9 @@ impl Constructor for PyClassMethod {
     type Args = PyObjectRef;
 
     fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult {
-        PyClassMethod { callable }.into_pyresult_with_type(vm, cls)
+        PyClassMethod { callable }
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/complex.rs b/vm/src/builtins/complex.rs
@@ -142,7 +142,9 @@ impl Constructor for PyComplex {
                     let value = parse_str(s.as_str().trim()).ok_or_else(|| {
                         vm.new_value_error("complex() arg is a malformed string".to_owned())
                     })?;
-                    return Self::from(value).into_pyresult_with_type(vm, cls);
+                    return Self::from(value)
+                        .into_ref_with_type(vm, cls)
+                        .map(Into::into);
                 } else {
                     return Err(vm.new_type_error(format!(
                         "complex() first argument must be a string or a number, not '{}'",
@@ -184,7 +186,9 @@ impl Constructor for PyComplex {
             imag.re
         };
         let value = Complex64::new(final_real, final_imag);
-        Self::from(value).into_pyresult_with_type(vm, cls)
+        Self::from(value)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -83,7 +83,9 @@ impl PyDict {
 
     #[pyslot]
     fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyDict::default().into_pyresult_with_type(vm, cls)
+        PyDict::default()
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/builtins/enumerate.rs b/vm/src/builtins/enumerate.rs
@@ -44,7 +44,8 @@ impl Constructor for PyEnumerate {
             counter: PyRwLock::new(counter),
             iterator,
         }
-        .into_pyresult_with_type(vm, cls)
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/filter.rs b/vm/src/builtins/filter.rs
@@ -31,7 +31,8 @@ impl Constructor for PyFilter {
             predicate: function,
             iterator,
         }
-        .into_pyresult_with_type(vm, cls)
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/float.rs b/vm/src/builtins/float.rs
@@ -183,7 +183,9 @@ impl Constructor for PyFloat {
                 }
             }
         };
-        PyFloat::from(float_val).into_pyresult_with_type(vm, cls)
+        PyFloat::from(float_val)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/function.rs b/vm/src/builtins/function.rs
@@ -485,7 +485,9 @@ impl Constructor for PyBoundMethod {
         Self::Args { function, object }: Self::Args,
         vm: &VirtualMachine,
     ) -> PyResult {
-        PyBoundMethod::new(object, function).into_pyresult_with_type(vm, cls)
+        PyBoundMethod::new(object, function)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
@@ -588,7 +590,9 @@ impl Constructor for PyCell {
     type Args = OptionalArg;
 
     fn py_new(cls: PyTypeRef, value: Self::Args, vm: &VirtualMachine) -> PyResult {
-        Self::new(value.into_option()).into_pyresult_with_type(vm, cls)
+        Self::new(value.into_option())
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/genericalias.rs b/vm/src/builtins/genericalias.rs
@@ -49,7 +49,9 @@ impl Constructor for PyGenericAlias {
             return Err(vm.new_type_error("GenericAlias() takes no keyword arguments".to_owned()));
         }
         let (origin, arguments): (_, PyObjectRef) = args.bind(vm)?;
-        PyGenericAlias::new(origin, arguments, vm).into_pyresult_with_type(vm, cls)
+        PyGenericAlias::new(origin, arguments, vm)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -341,7 +341,9 @@ impl PyList {
 
     #[pyslot]
     fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyList::default().into_pyresult_with_type(vm, cls)
+        PyList::default()
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/builtins/map.rs b/vm/src/builtins/map.rs
@@ -29,7 +29,9 @@ impl Constructor for PyMap {
 
     fn py_new(cls: PyTypeRef, (mapper, iterators): Self::Args, vm: &VirtualMachine) -> PyResult {
         let iterators = iterators.into_vec();
-        PyMap { mapper, iterators }.into_pyresult_with_type(vm, cls)
+        PyMap { mapper, iterators }
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs
@@ -53,7 +53,8 @@ impl Constructor for PyMappingProxy {
             Self {
                 mapping: MappingProxyInner::Dict(mapping),
             }
-            .into_pyresult_with_type(vm, cls)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
         }
     }
 }
diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs
@@ -57,7 +57,7 @@ impl Constructor for PyMemoryView {
 
     fn py_new(cls: PyTypeRef, args: Self::Args, vm: &VirtualMachine) -> PyResult {
         let zelf = Self::from_object(&args.object, vm)?;
-        zelf.into_pyresult_with_type(vm, cls)
+        zelf.into_ref_with_type(vm, cls).map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/module.rs b/vm/src/builtins/module.rs
@@ -35,7 +35,7 @@ impl PyModule {
 
     #[pyslot]
     fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyModule {}.into_pyresult_with_type(vm, cls)
+        PyModule {}.into_ref_with_type(vm, cls).map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/builtins/namespace.rs b/vm/src/builtins/namespace.rs
@@ -25,7 +25,7 @@ impl Constructor for PyNamespace {
     type Args = FuncArgs;
 
     fn py_new(cls: PyTypeRef, _args: Self::Args, vm: &VirtualMachine) -> PyResult {
-        PyNamespace {}.into_pyresult_with_type(vm, cls)
+        PyNamespace {}.into_ref_with_type(vm, cls).map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/property.rs b/vm/src/builtins/property.rs
@@ -95,7 +95,8 @@ impl PyProperty {
             deleter: PyRwLock::new(None),
             doc: PyRwLock::new(None),
         }
-        .into_pyresult_with_type(vm, cls)
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/builtins/pystr.rs b/vm/src/builtins/pystr.rs
@@ -320,7 +320,9 @@ impl Constructor for PyStr {
         if string.class().is(&cls) {
             Ok(string.into())
         } else {
-            PyStr::from(string.as_str()).into_pyresult_with_type(vm, cls)
+            PyStr::from(string.as_str())
+                .into_ref_with_type(vm, cls)
+                .map(Into::into)
         }
     }
 }
diff --git a/vm/src/builtins/pysuper.rs b/vm/src/builtins/pysuper.rs
@@ -91,7 +91,9 @@ impl Constructor for PySuper {
             (typ, obj)
         };
 
-        PySuper::new(typ, obj, vm)?.into_pyresult_with_type(vm, cls)
+        PySuper::new(typ, obj, vm)?
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/set.rs b/vm/src/builtins/set.rs
@@ -398,7 +398,7 @@ impl PySet {
 impl PySet {
     #[pyslot]
     fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PySet::default().into_pyresult_with_type(vm, cls)
+        PySet::default().into_ref_with_type(vm, cls).map(Into::into)
     }
 
     #[pymethod(magic)]
@@ -725,7 +725,8 @@ impl Constructor for PyFrozenSet {
         if elements.is_empty() && cls.is(&vm.ctx.types.frozenset_type) {
             Ok(vm.ctx.empty_frozenset.clone().into())
         } else {
-            Self::from_iter(vm, elements).and_then(|o| o.into_pyresult_with_type(vm, cls))
+            Self::from_iter(vm, elements)
+                .and_then(|o| o.into_ref_with_type(vm, cls).map(Into::into))
         }
     }
 }
diff --git a/vm/src/builtins/slice.rs b/vm/src/builtins/slice.rs
@@ -101,7 +101,7 @@ impl PySlice {
                 }
             }
         };
-        slice.into_pyresult_with_type(vm, cls)
+        slice.into_ref_with_type(vm, cls).map(Into::into)
     }
 
     pub(crate) fn inner_indices(
diff --git a/vm/src/builtins/staticmethod.rs b/vm/src/builtins/staticmethod.rs
@@ -41,7 +41,9 @@ impl Constructor for PyStaticMethod {
     type Args = PyObjectRef;
 
     fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult {
-        PyStaticMethod { callable }.into_pyresult_with_type(vm, cls)
+        PyStaticMethod { callable }
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/tuple.rs b/vm/src/builtins/tuple.rs
@@ -113,7 +113,8 @@ impl Constructor for PyTuple {
             Self {
                 elements: elements.into_boxed_slice(),
             }
-            .into_pyresult_with_type(vm, cls)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
         }
     }
 }
diff --git a/vm/src/builtins/weakproxy.rs b/vm/src/builtins/weakproxy.rs
@@ -48,7 +48,8 @@ impl Constructor for PyWeakProxy {
         PyWeakProxy {
             weak: referent.downgrade_with_typ(callback.into_option(), weak_cls.clone(), vm)?,
         }
-        .into_pyresult_with_type(vm, cls)
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
     }
 }
 
diff --git a/vm/src/builtins/zip.rs b/vm/src/builtins/zip.rs
@@ -34,7 +34,9 @@ impl Constructor for PyZip {
     fn py_new(cls: PyTypeRef, (iterators, args): Self::Args, vm: &VirtualMachine) -> PyResult {
         let iterators = iterators.into_vec();
         let strict = Radium::new(args.strict.unwrap_or(false));
-        PyZip { iterators, strict }.into_pyresult_with_type(vm, cls)
+        PyZip { iterators, strict }
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 }
 
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -427,7 +427,9 @@ impl PyBaseException {
 
     #[pyslot]
     pub(crate) fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        PyBaseException::new(args.args, vm).into_pyresult_with_type(vm, cls)
+        PyBaseException::new(args.args, vm)
+            .into_ref_with_type(vm, cls)
+            .map(Into::into)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/object/payload.rs b/vm/src/object/payload.rs
@@ -66,11 +66,6 @@ pub trait PyPayload: std::fmt::Debug + PyThreadingConstraint + Sized + 'static {
             Err(_into_ref_with_type_error(vm, &cls, exact_class))
         }
     }
-
-    #[inline]
-    fn into_pyresult_with_type(self, vm: &VirtualMachine, cls: PyTypeRef) -> PyResult {
-        self.into_ref_with_type(vm, cls).map(Into::into)
-    }
 }
 
 pub trait PyObjectPayload:
diff --git a/vm/src/stdlib/collections.rs b/vm/src/stdlib/collections.rs
@@ -58,7 +58,9 @@ mod _collections {
     impl PyDeque {
         #[pyslot]
         fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-            PyDeque::default().into_pyresult_with_type(vm, cls)
+            PyDeque::default()
+                .into_ref_with_type(vm, cls)
+                .map(Into::into)
         }
 
         #[pymethod(magic)]
@@ -605,7 +607,7 @@ mod _collections {
                 let index = max(index, 0) as usize;
                 iter.internal.lock().position = index;
             }
-            iter.into_pyresult_with_type(vm, cls)
+            iter.into_ref_with_type(vm, cls).map(Into::into)
         }
     }
 
@@ -678,7 +680,7 @@ mod _collections {
                 let index = max(index, 0) as usize;
                 iter.internal.lock().position = index;
             }
-            iter.into_pyresult_with_type(vm, cls)
+            iter.into_ref_with_type(vm, cls).map(Into::into)
         }
     }
 
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
diff --git a/vm/src/stdlib/operator.rs b/vm/src/stdlib/operator.rs
diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
diff --git a/vm/src/stdlib/thread.rs b/vm/src/stdlib/thread.rs

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ mod _json {`
`60`	`60`	`parse_constant,`
`61`	`61`	`ctx,`
`62`	`62`	`}`
`63`		`- .into_pyresult_with_type(vm, cls)`
	`63`	`+ .into_ref_with_type(vm, cls)`
	`64`	`+ .map(Into::into)`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,9 @@ pub(crate) mod _struct {`
`250`	`250`	`fn py_new(cls: PyTypeRef, fmt: Self::Args, vm: &VirtualMachine) -> PyResult {`
`251`	`251`	`let spec = fmt.format_spec(vm)?;`
`252`	`252`	`let format = fmt.0;`
`253`		`- PyStruct { spec, format }.into_pyresult_with_type(vm, cls)`
	`253`	`+ PyStruct { spec, format }`
	`254`	`+ .into_ref_with_type(vm, cls)`
	`255`	`+ .map(Into::into)`
`254`	`256`	`}`
`255`	`257`	`}`
`256`	`258`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ mod _random {`
`73`	`73`	`PyRandom {`
`74`	`74`	`rng: PyMutex::default(),`
`75`	`75`	`}`
`76`		`- .into_pyresult_with_type(vm, cls)`
	`76`	`+ .into_ref_with_type(vm, cls)`
	`77`	`+ .map(Into::into)`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ mod _socket {`
`547`	`547`	`impl PySocket {`
`548`	`548`	`#[pyslot]`
`549`	`549`	`fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {`
`550`		`- Self::default().into_pyresult_with_type(vm, cls)`
	`550`	`+ Self::default().into_ref_with_type(vm, cls).map(Into::into)`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`#[pymethod(magic)]`
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,8 @@ mod _ssl {`
`489`	`489`	`check_hostname: AtomicCell::new(check_hostname),`
`490`	`490`	`protocol: proto,`
`491`	`491`	`}`
`492`		`- .into_pyresult_with_type(vm, cls)`
	`492`	`+ .into_ref_with_type(vm, cls)`
	`493`	`+ .map(Into::into)`
`493`	`494`	`}`
`494`	`495`	`}`
`495`	`496`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ impl Constructor for PyClassMethod {`
`61`	`61`	`type Args = PyObjectRef;`
`62`	`62`
`63`	`63`	`fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult {`
`64`		`- PyClassMethod { callable }.into_pyresult_with_type(vm, cls)`
	`64`	`+ PyClassMethod { callable }`
	`65`	`+ .into_ref_with_type(vm, cls)`
	`66`	`+ .map(Into::into)`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ impl PyDict {`
`83`	`83`
`84`	`84`	`#[pyslot]`
`85`	`85`	`fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {`
`86`		`- PyDict::default().into_pyresult_with_type(vm, cls)`
	`86`	`+ PyDict::default()`
	`87`	`+ .into_ref_with_type(vm, cls)`
	`88`	`+ .map(Into::into)`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`#[pymethod(magic)]`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ impl Constructor for PyEnumerate {`
`44`	`44`	`counter: PyRwLock::new(counter),`
`45`	`45`	`iterator,`
`46`	`46`	`}`
`47`		`- .into_pyresult_with_type(vm, cls)`
	`47`	`+ .into_ref_with_type(vm, cls)`
	`48`	`+ .map(Into::into)`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`