feat(conv): better error messages in schema conversions (#440)

ucb-substrate · Aug 4, 2024 · bad9503 · bad9503
1 parent a6ffd9a
commit bad9503
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libs/spice/src/netlist.rs b/libs/spice/src/netlist.rs
@@ -383,7 +383,10 @@ impl HasSpiceLikeNetlist for Spice {
                 let name = arcstr::format!("R{}", name);
                 write!(out, "{}", name)?;
                 for port in ["1", "2"] {
-                    for part in connections.remove(port).unwrap() {
+                    for part in connections
+                        .remove(port)
+                        .unwrap_or_else(|| panic!("res2 instance `{name}` must connect to all ports; missing connection to port `{port}`"))
+                    {
                         write!(out, " {}", part)?;
                     }
                 }
@@ -411,7 +414,10 @@ impl HasSpiceLikeNetlist for Spice {
                 let name = arcstr::format!("D{}", name);
                 write!(out, "{}", name)?;
                 for port in ["1", "2"] {
-                    for part in connections.remove(port).unwrap() {
+                    for part in connections
+                        .remove(port)
+                        .unwrap_or_else(|| panic!("diode2 instance `{name}` must connect to all ports; missing connection to port `{port}`"))
+                    {
                         write!(out, " {}", part)?;
                     }
                 }

diff --git a/tools/spectre/src/lib.rs b/tools/spectre/src/lib.rs
@@ -1129,7 +1129,7 @@ impl HasSpiceLikeNetlist for Spectre {
             } => {
                 let connections = ports
                     .iter()
-                    .flat_map(|port| connections.remove(port).unwrap())
+                    .flat_map(|port| connections.remove(port).unwrap_or_else(|| panic!("raw instance `{name}` must connect to all ports; missing connection to port `{port}`")))
                     .collect();
                 let name = self.write_instance(out, name, connections, cell)?;
                 for (key, value) in params.iter().sorted_by_key(|(key, _)| *key) {