Rename PyValue::{required_type => class}

OddCoincidence · OddCoincidence · commit 737ec12fa5fe · 2019-03-14T20:08:41.000-07:00
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -184,7 +184,7 @@ pub struct Frame {
 }
 
 impl PyValue for Frame {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.frame_type()
     }
 }
diff --git a/vm/src/obj/objbuiltinfunc.rs b/vm/src/obj/objbuiltinfunc.rs
@@ -8,7 +8,7 @@ pub struct PyBuiltinFunction {
 }
 
 impl PyValue for PyBuiltinFunction {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.builtin_function_or_method_type()
     }
 }
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -29,7 +29,7 @@ impl PyByteArray {
 }
 
 impl PyValue for PyByteArray {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.bytearray_type()
     }
 }
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -30,7 +30,7 @@ impl Deref for PyBytes {
 }
 
 impl PyValue for PyBytes {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.bytes_type()
     }
 }
diff --git a/vm/src/obj/objcode.rs b/vm/src/obj/objcode.rs
@@ -26,7 +26,7 @@ impl fmt::Debug for PyCode {
 }
 
 impl PyValue for PyCode {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.code_type()
     }
 }
diff --git a/vm/src/obj/objcomplex.rs b/vm/src/obj/objcomplex.rs
@@ -14,7 +14,7 @@ pub struct PyComplex {
 }
 
 impl PyValue for PyComplex {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.complex_type()
     }
 }
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -30,7 +30,7 @@ impl fmt::Debug for PyDict {
 }
 
 impl PyValue for PyDict {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.dict_type()
     }
 }
diff --git a/vm/src/obj/objenumerate.rs b/vm/src/obj/objenumerate.rs
@@ -17,7 +17,7 @@ pub struct PyEnumerate {
 }
 
 impl PyValue for PyEnumerate {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.enumerate_type()
     }
 }
diff --git a/vm/src/obj/objfilter.rs b/vm/src/obj/objfilter.rs
@@ -13,7 +13,7 @@ pub struct PyFilter {
 }
 
 impl PyValue for PyFilter {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.filter_type()
     }
 }
diff --git a/vm/src/obj/objfloat.rs b/vm/src/obj/objfloat.rs
@@ -16,7 +16,7 @@ pub struct PyFloat {
 }
 
 impl PyValue for PyFloat {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.float_type()
     }
 }
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -23,7 +23,7 @@ impl PyFunction {
 }
 
 impl PyValue for PyFunction {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.function_type()
     }
 }
@@ -42,7 +42,7 @@ impl PyMethod {
 }
 
 impl PyValue for PyMethod {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.bound_method_type()
     }
 }
diff --git a/vm/src/obj/objgenerator.rs b/vm/src/obj/objgenerator.rs
@@ -14,7 +14,7 @@ pub struct PyGenerator {
 }
 
 impl PyValue for PyGenerator {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.generator_type()
     }
 }
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -36,7 +36,7 @@ impl IntoPyObject for BigInt {
 }
 
 impl PyValue for PyInt {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.int_type()
     }
 }
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -38,7 +38,7 @@ impl From<Vec<PyObjectRef>> for PyList {
 }
 
 impl PyValue for PyList {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.list_type()
     }
 }
diff --git a/vm/src/obj/objmap.rs b/vm/src/obj/objmap.rs
@@ -12,7 +12,7 @@ pub struct PyMap {
 }
 
 impl PyValue for PyMap {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.map_type()
     }
 }
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -9,7 +9,7 @@ pub struct PyMemoryView {
 }
 
 impl PyValue for PyMemoryView {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.memoryview_type()
     }
 }
diff --git a/vm/src/obj/objmodule.rs b/vm/src/obj/objmodule.rs
@@ -9,7 +9,7 @@ pub struct PyModule {
 pub type PyModuleRef = PyRef<PyModule>;
 
 impl PyValue for PyModule {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.module_type()
     }
 }
diff --git a/vm/src/obj/objnone.rs b/vm/src/obj/objnone.rs
@@ -8,7 +8,7 @@ pub struct PyNone;
 pub type PyNoneRef = PyRef<PyNone>;
 
 impl PyValue for PyNone {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.none().typ()
     }
 }
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
@@ -12,7 +12,7 @@ use crate::vm::VirtualMachine;
 pub struct PyInstance;
 
 impl PyValue for PyInstance {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.object()
     }
 }
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -16,7 +16,7 @@ pub struct PyReadOnlyProperty {
 }
 
 impl PyValue for PyReadOnlyProperty {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.readonly_property_type()
     }
 }
@@ -38,7 +38,7 @@ pub struct PyProperty {
 }
 
 impl PyValue for PyProperty {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.property_type()
     }
 }
diff --git a/vm/src/obj/objrange.rs b/vm/src/obj/objrange.rs
@@ -24,7 +24,7 @@ pub struct PyRange {
 }
 
 impl PyValue for PyRange {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.range_type()
     }
 }
diff --git a/vm/src/obj/objset.rs b/vm/src/obj/objset.rs
@@ -30,7 +30,7 @@ impl fmt::Debug for PySet {
 }
 
 impl PyValue for PySet {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.set_type()
     }
 }
diff --git a/vm/src/obj/objslice.rs b/vm/src/obj/objslice.rs
@@ -14,7 +14,7 @@ pub struct PySlice {
 }
 
 impl PyValue for PySlice {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.slice_type()
     }
 }
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -597,7 +597,7 @@ impl PyStringRef {
 }
 
 impl PyValue for PyString {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.str_type()
     }
 }
diff --git a/vm/src/obj/objtuple.rs b/vm/src/obj/objtuple.rs
@@ -39,7 +39,7 @@ impl From<Vec<PyObjectRef>> for PyTuple {
 }
 
 impl PyValue for PyTuple {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.tuple_type()
     }
 }
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -22,7 +22,7 @@ pub struct PyClass {
 pub type PyClassRef = PyRef<PyClass>;
 
 impl PyValue for PyClass {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.type_type()
     }
 }
diff --git a/vm/src/obj/objweakref.rs b/vm/src/obj/objweakref.rs
@@ -23,7 +23,7 @@ impl PyWeak {
 }
 
 impl PyValue for PyWeak {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.weakref_type()
     }
 }
diff --git a/vm/src/obj/objzip.rs b/vm/src/obj/objzip.rs
@@ -11,7 +11,7 @@ pub struct PyZip {
 }
 
 impl PyValue for PyZip {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.zip_type()
     }
 }
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -164,7 +164,7 @@ pub fn create_type(name: &str, type_type: &PyObjectRef, base: &PyObjectRef) -> P
 pub struct PyNotImplemented;
 
 impl PyValue for PyNotImplemented {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.not_implemented().typ()
     }
 }
@@ -173,7 +173,7 @@ impl PyValue for PyNotImplemented {
 pub struct PyEllipsis;
 
 impl PyValue for PyEllipsis {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.ellipsis_type.clone()
     }
 }
@@ -715,21 +715,21 @@ pub struct PyRef<T> {
 impl<T: PyValue> PyRef<T> {
     pub fn new(ctx: &PyContext, payload: T) -> Self {
         PyRef {
-            obj: PyObject::new(payload, T::required_type(ctx)),
+            obj: PyObject::new(payload, T::class(ctx)),
             _payload: PhantomData,
         }
     }
 
     pub fn new_with_type(vm: &mut VirtualMachine, payload: T, cls: PyClassRef) -> PyResult<Self> {
-        let required_type = T::required_type(&vm.ctx);
-        if objtype::issubclass(&cls.obj, &required_type) {
+        let class = T::class(&vm.ctx);
+        if objtype::issubclass(&cls.obj, &class) {
             Ok(PyRef {
                 obj: PyObject::new(payload, cls.obj),
                 _payload: PhantomData,
             })
         } else {
             let subtype = vm.to_pystr(&cls.obj)?;
-            let basetype = vm.to_pystr(&required_type)?;
+            let basetype = vm.to_pystr(&class)?;
             Err(vm.new_type_error(format!("{} is not a subtype of {}", subtype, basetype)))
         }
     }
@@ -765,13 +765,13 @@ where
     T: PyValue,
 {
     fn try_from_object(vm: &mut VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
-        if objtype::isinstance(&obj, &T::required_type(&vm.ctx)) {
+        if objtype::isinstance(&obj, &T::class(&vm.ctx)) {
             Ok(PyRef {
                 obj,
                 _payload: PhantomData,
             })
         } else {
-            let expected_type = vm.to_pystr(&T::required_type(&vm.ctx))?;
+            let expected_type = vm.to_pystr(&T::class(&vm.ctx))?;
             let actual_type = vm.to_pystr(&obj.typ())?;
             Err(vm.new_type_error(format!(
                 "Expected type {}, not {}",
@@ -1408,7 +1408,7 @@ where
     T: PyValue + Sized,
 {
     fn into_pyobject(self, ctx: &PyContext) -> PyResult {
-        Ok(PyObject::new(self, T::required_type(ctx)))
+        Ok(PyObject::new(self, T::class(ctx)))
     }
 }
 
@@ -1547,7 +1547,7 @@ pub struct PyIteratorValue {
 }
 
 impl PyValue for PyIteratorValue {
-    fn required_type(ctx: &PyContext) -> PyObjectRef {
+    fn class(ctx: &PyContext) -> PyObjectRef {
         ctx.iter_type()
     }
 }
@@ -1574,25 +1574,25 @@ impl PyObject {
 }
 
 pub trait PyValue: fmt::Debug + Sized + 'static {
-    fn required_type(ctx: &PyContext) -> PyObjectRef;
+    fn class(ctx: &PyContext) -> PyObjectRef;
 
     fn into_ref(self, ctx: &PyContext) -> PyRef<Self> {
         PyRef {
-            obj: PyObject::new(self, Self::required_type(ctx)),
+            obj: PyObject::new(self, Self::class(ctx)),
             _payload: PhantomData,
         }
     }
 
     fn into_ref_with_type(self, vm: &mut VirtualMachine, cls: PyClassRef) -> PyResult<PyRef<Self>> {
-        let required_type = Self::required_type(&vm.ctx);
-        if objtype::issubclass(&cls.obj, &required_type) {
+        let class = Self::class(&vm.ctx);
+        if objtype::issubclass(&cls.obj, &class) {
             Ok(PyRef {
                 obj: PyObject::new(self, cls.obj),
                 _payload: PhantomData,
             })
         } else {
             let subtype = vm.to_pystr(&cls.obj)?;
-            let basetype = vm.to_pystr(&required_type)?;
+            let basetype = vm.to_pystr(&class)?;
             Err(vm.new_type_error(format!("{} is not a subtype of {}", subtype, basetype)))
         }
     }
diff --git a/vm/src/stdlib/re.rs b/vm/src/stdlib/re.rs
@@ -17,7 +17,7 @@ use crate::pyobject::{
 use crate::VirtualMachine;
 
 impl PyValue for Regex {
-    fn required_type(_ctx: &PyContext) -> PyObjectRef {
+    fn class(_ctx: &PyContext) -> PyObjectRef {
         // TODO
         unimplemented!()
     }
@@ -111,7 +111,7 @@ struct PyMatch {
 }
 
 impl PyValue for PyMatch {
-    fn required_type(_ctx: &PyContext) -> PyObjectRef {
+    fn class(_ctx: &PyContext) -> PyObjectRef {
         // TODO
         unimplemented!()
     }
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ pub struct Frame {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`impl PyValue for Frame {`
`187`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`187`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`188`	`188`	`ctx.frame_type()`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pub struct PyBuiltinFunction {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`impl PyValue for PyBuiltinFunction {`
`11`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`11`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`12`	`12`	`ctx.builtin_function_or_method_type()`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ impl PyByteArray {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`impl PyValue for PyByteArray {`
`32`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`32`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`33`	`33`	`ctx.bytearray_type()`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ impl Deref for PyBytes {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl PyValue for PyBytes {`
`33`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`33`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`34`	`34`	`ctx.bytes_type()`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl fmt::Debug for PyCode {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`impl PyValue for PyCode {`
`29`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`29`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`30`	`30`	`ctx.code_type()`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub struct PyComplex {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`impl PyValue for PyComplex {`
`17`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`17`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`18`	`18`	`ctx.complex_type()`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ impl fmt::Debug for PyDict {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl PyValue for PyDict {`
`33`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`33`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`34`	`34`	`ctx.dict_type()`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ pub struct PyEnumerate {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl PyValue for PyEnumerate {`
`20`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`20`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`21`	`21`	`ctx.enumerate_type()`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ pub struct PyFilter {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl PyValue for PyFilter {`
`16`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`16`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`17`	`17`	`ctx.filter_type()`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ pub struct PyFloat {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`impl PyValue for PyFloat {`
`19`		`- fn required_type(ctx: &PyContext) -> PyObjectRef {`
	`19`	`+ fn class(ctx: &PyContext) -> PyObjectRef {`
`20`	`20`	`ctx.float_type()`
`21`	`21`	`}`
`22`	`22`	`}`