Prevent recursion for Debug impls

Author: coolreader18

vm/src/frame.rs

@@ -1211,11 +1211,18 @@ impl Frame {
 
 impl fmt::Debug for Frame {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        trace!("formatting stack");
         let stack_str = self
             .stack
             .borrow()
             .iter()
-            .map(|elem| format!("\n  > {:?}", elem))
+            .map(|elem| {
+                if elem.payload.as_any().is::<Frame>() {
+                    "\n  > {frame}".to_string()
+                } else {
+                    format!("\n  > {:?}", elem)
+                }
+            })
             .collect::<String>();
         let block_str = self
             .blocks

vm/src/obj/objdict.rs

@@ -1,5 +1,6 @@
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
+use std::fmt;
 use std::ops::{Deref, DerefMut};
 
 use crate::pyobject::{
@@ -14,13 +15,20 @@ use super::objtype;
 
 pub type DictContentType = HashMap<String, (PyObjectRef, PyObjectRef)>;
 
-#[derive(Default, Debug)]
+#[derive(Default)]
 pub struct PyDict {
     // TODO: should be private
     pub entries: RefCell<DictContentType>,
 }
 pub type PyDictRef = PyRef<PyDict>;
 
+impl fmt::Debug for PyDict {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // TODO: implement more detailed, non-recursive Debug formatter
+        f.write_str("dict")
+    }
+}
+
 impl PyValue for PyDict {
     fn required_type(ctx: &PyContext) -> PyObjectRef {
         ctx.dict_type()

vm/src/obj/objlist.rs

@@ -14,13 +14,21 @@ use crate::pyobject::{
 };
 use crate::vm::{ReprGuard, VirtualMachine};
 use num_traits::ToPrimitive;
+use std::fmt;
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct PyList {
     // TODO: shouldn't be public
     pub elements: RefCell<Vec<PyObjectRef>>,
 }
 
+impl fmt::Debug for PyList {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // TODO: implement more detailed, non-recursive Debug formatter
+        f.write_str("list")
+    }
+}
+
 impl From<Vec<PyObjectRef>> for PyList {
     fn from(elements: Vec<PyObjectRef>) -> Self {
         PyList {

vm/src/obj/objset.rs

@@ -3,8 +3,8 @@
  */
 
 use std::cell::{Cell, RefCell};
-use std::collections::hash_map::DefaultHasher;
-use std::collections::HashMap;
+use std::collections::{hash_map::DefaultHasher, HashMap};
+use std::fmt;
 use std::hash::{Hash, Hasher};
 
 use super::objbool;
@@ -17,11 +17,18 @@ use crate::pyobject::{
 };
 use crate::vm::{ReprGuard, VirtualMachine};
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct PySet {
     elements: RefCell<HashMap<u64, PyObjectRef>>,
 }
 
+impl fmt::Debug for PySet {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // TODO: implement more detailed, non-recursive Debug formatter
+        f.write_str("set")
+    }
+}
+
 impl PyValue for PySet {
     fn required_type(ctx: &PyContext) -> PyObjectRef {
         ctx.set_type()

vm/src/obj/objtuple.rs

@@ -1,4 +1,5 @@
 use std::cell::{Cell, RefCell};
+use std::fmt;
 use std::hash::{Hash, Hasher};
 
 use crate::pyobject::{
@@ -15,13 +16,20 @@ use super::objsequence::{
 use super::objstr;
 use super::objtype;
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct PyTuple {
     // TODO: shouldn't be public
     // TODO: tuples are immutable, remove this RefCell
     pub elements: RefCell<Vec<PyObjectRef>>,
 }
 
+impl fmt::Debug for PyTuple {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // TODO: implement more informational, non-recursive Debug formatter
+        f.write_str("tuple")
+    }
+}
+
 impl From<Vec<PyObjectRef>> for PyTuple {
     fn from(elements: Vec<PyObjectRef>) -> Self {
         PyTuple {