Rename into_generic_pyobj -> into_typed_pyobj

coolreader18 · coolreader18 · commit 7143b9320355 · 2020-04-03T11:43:07.000-05:00
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -526,7 +526,7 @@ pub fn new(
             slots: RefCell::default(),
         },
         dict: None,
-        typ: typ.into_generic_pyobj(),
+        typ: typ.into_typed_pyobj(),
     }
     .into_ref();
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -571,7 +571,7 @@ impl PyContext {
 
     pub fn new_base_object(&self, class: PyClassRef, dict: Option<PyDictRef>) -> PyObjectRef {
         PyObject {
-            typ: class.into_generic_pyobj(),
+            typ: class.into_typed_pyobj(),
             dict: dict.map(RefCell::new),
             payload: objobject::PyBaseObject,
         }
@@ -722,7 +722,7 @@ impl<T: PyValue> PyRef<T> {
         self.obj.class()
     }
 
-    pub fn into_generic_pyobj(self) -> Rc<PyObject<T>> {
+    pub fn into_typed_pyobj(self) -> Rc<PyObject<T>> {
         self.into_object().downcast_generic().unwrap()
     }
 }
@@ -1123,7 +1123,7 @@ where
     #[allow(clippy::new_ret_no_self)]
     pub fn new(payload: T, typ: PyClassRef, dict: Option<PyDictRef>) -> PyObjectRef {
         PyObject {
-            typ: typ.into_generic_pyobj(),
+            typ: typ.into_typed_pyobj(),
             dict: dict.map(RefCell::new),
             payload,
         }

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ impl PyContext {`
`571`	`571`
`572`	`572`	`pub fn new_base_object(&self, class: PyClassRef, dict: Option<PyDictRef>) -> PyObjectRef {`
`573`	`573`	`PyObject {`
`574`		`- typ: class.into_generic_pyobj(),`
	`574`	`+ typ: class.into_typed_pyobj(),`
`575`	`575`	`dict: dict.map(RefCell::new),`
`576`	`576`	`payload: objobject::PyBaseObject,`
`577`	`577`	`}`
`@@ -722,7 +722,7 @@ impl<T: PyValue> PyRef<T> {`
`722`	`722`	`self.obj.class()`
`723`	`723`	`}`
`724`	`724`
`725`		`- pub fn into_generic_pyobj(self) -> Rc<PyObject<T>> {`
	`725`	`+ pub fn into_typed_pyobj(self) -> Rc<PyObject<T>> {`
`726`	`726`	`self.into_object().downcast_generic().unwrap()`
`727`	`727`	`}`
`728`	`728`	`}`
`@@ -1123,7 +1123,7 @@ where`
`1123`	`1123`	`#[allow(clippy::new_ret_no_self)]`
`1124`	`1124`	`pub fn new(payload: T, typ: PyClassRef, dict: Option<PyDictRef>) -> PyObjectRef {`
`1125`	`1125`	`PyObject {`
`1126`		`- typ: typ.into_generic_pyobj(),`
	`1126`	`+ typ: typ.into_typed_pyobj(),`
`1127`	`1127`	`dict: dict.map(RefCell::new),`
`1128`	`1128`	`payload,`
`1129`	`1129`	`}`