Clean up a bit

coolreader18 · coolreader18 · commit d305d4f74bab · 2019-03-12T19:06:12.000-05:00
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
@@ -12,8 +12,8 @@ use crate::vm::VirtualMachine;
 pub struct PyInstance;
 
 impl PyValue for PyInstance {
-    fn required_type(_ctx: &PyContext) -> PyObjectRef {
-        panic!("no specific type for PyInstance, don't type check me")
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.object()
     }
 }
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1567,21 +1567,9 @@ pub trait PyValue: fmt::Debug + 'static {
     fn required_type(ctx: &PyContext) -> PyObjectRef;
 }
 
-pub trait PyObjectPayload: Any + fmt::Debug + 'static {
-    fn required_type(&self, ctx: &PyContext) -> PyObjectRef;
-}
-
-impl<T: PyValue + 'static> PyObjectPayload for T {
-    fn required_type(&self, ctx: &PyContext) -> PyObjectRef {
-        T::required_type(ctx)
-    }
-}
+pub trait PyObjectPayload: Any + fmt::Debug + 'static {}
 
-impl PyObjectPayload for () {
-    fn required_type(&self, _ctx: &PyContext) -> PyObjectRef {
-        panic!("No specific python type for rust unit, don't type check")
-    }
-}
+impl<T: PyValue + 'static> PyObjectPayload for T {}
 
 impl FromPyObjectRef for PyRef<PyClass> {
     fn from_pyobj(obj: &PyObjectRef) -> Self {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ use crate::vm::VirtualMachine;`
`12`	`12`	`pub struct PyInstance;`
`13`	`13`
`14`	`14`	`impl PyValue for PyInstance {`
`15`		`- fn required_type(_ctx: &PyContext) -> PyObjectRef {`
`16`		`- panic!("no specific type for PyInstance, don't type check me")`
	`15`	`+ fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`16`	`+ ctx.object()`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`