Implement Display for MemorySegmentManager (lambdaclass#1606)

* Impl Display for MemorySegmentManager * Remove old code + Add changelog entry * Fix * fmt * Update test --------- Co-authored-by: Pedro Fontana <[email protected]>
Moonsong-Labs · Feb 21, 2024 · 0e6a235 · 0e6a235
1 parent beede16
commit 0e6a235
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### Upcoming Changes
 
+* feat: Implement `Display` for `MemorySegmentManager`[#1606](https://github.com/lambdaclass/cairo-vm/pull/1606)
+
 * fix: make Felt252DictEntryUpdate work with MaybeRelocatable instead of only Felt [#1624](https://github.com/lambdaclass/cairo-vm/pull/1624).
 
 * chore: bump `cairo-lang-` dependencies to 2.5.3 [#1596](https://github.com/lambdaclass/cairo-vm/pull/1596)

diff --git a/vm/src/vm/vm_memory/memory.rs b/vm/src/vm/vm_memory/memory.rs
@@ -551,7 +551,7 @@ impl fmt::Display for Memory {
                 }
             }
         }
-        writeln!(f, "}}")
+        Ok(())
     }
 }
 
@@ -1424,7 +1424,7 @@ mod memory_tests {
 
         assert_eq!(
             format!("{}", memory),
-            "(-1,0) : -1:0\n(-1,1) : 8\n(-1,2) : 9\n(0,0) : 1\n(0,1) : -1:0\n(0,2) : 3\n(1,0) : -1:1\n(1,1) : 5\n(1,2) : -1:2\n}\n");
+            "(-1,0) : -1:0\n(-1,1) : 8\n(-1,2) : 9\n(0,0) : 1\n(0,1) : -1:0\n(0,2) : 3\n(1,0) : -1:1\n(1,1) : 5\n(1,2) : -1:2\n");
     }
 
     #[test]

diff --git a/vm/src/vm/vm_memory/memory_segments.rs b/vm/src/vm/vm_memory/memory_segments.rs
@@ -1,3 +1,5 @@
+use core::fmt;
+
 use crate::stdlib::prelude::*;
 use crate::stdlib::{any::Any, collections::HashMap};
 use crate::vm::runners::cairo_runner::CairoArg;
@@ -269,6 +271,28 @@ impl Default for MemorySegmentManager {
     }
 }
 
+impl fmt::Display for MemorySegmentManager {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(f, "Memory:\n{}", self.memory)?;
+        if let Some(used_sizes) = &self.segment_used_sizes {
+            writeln!(f, "Segment Info:")?;
+            for (index, used_size) in used_sizes.iter().enumerate() {
+                writeln!(
+                    f,
+                    "Segment Number: {}, Used Size: {}, Size {}",
+                    index,
+                    used_size,
+                    self.segment_sizes
+                        .get(&index)
+                        .map(|n| n.to_string())
+                        .unwrap_or(String::from("None"))
+                )?;
+            }
+        }
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;