Fix dotgraph tooltip

src/visualization/dot_graph.rs

@@ -63,13 +63,6 @@ impl DotGraph {
     }
 }
 
-pub struct DotSubgraph {
-    pub id: String,
-    pub label: String,
-    pub nodes: Vec<DotNode>,
-    pub rank_annotations: Vec<RankAnnotation>,
-}
-
 pub struct RankAnnotation {
     pub rank_type: String,
     pub nodes: BTreeSet<NodeId>,
@@ -90,20 +83,6 @@ impl Display for RankAnnotation {
     }
 }
 
-impl Display for DotSubgraph {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "subgraph {} {{", self.id)?;
-        writeln!(f, "label=\"{}\";", self.label)?;
-        for node in &self.nodes {
-            writeln!(f, "{}", node)?;
-        }
-        for rank_annotation in &self.rank_annotations {
-            writeln!(f, "{}", rank_annotation)?;
-        }
-        writeln!(f, "}}")
-    }
-}
-
 impl Display for DotGraph {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "digraph {} {{", self.name)?;
@@ -151,7 +130,17 @@ pub struct DotStringAttr(pub String);
 
 impl Display for DotStringAttr {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "\"{}\"", self.0)
+        write!(f, "\"{}\"", self.0.replace("\"", "\\\""))
+    }
+}
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dotstring_attr_escapes_quotes() {
+        let attr = DotStringAttr("extern \"RustCall\"".to_string());
+        assert_eq!(attr.to_string(), "\"extern \\\"RustCall\\\"\"");
     }
 }
 
@@ -276,7 +265,7 @@ impl Display for DotEdge {
         let direction_part = match &self.options.direction {
             Some(EdgeDirection::Backward) => ", dir=\"back\"",
             Some(EdgeDirection::Forward) => "",
-            None => ", arrowhead=\"none\"",
+            None => "dir=\"none\", constraint=false",
         };
         let color_part = match &self.options.color {
             Some(color) => format!(", color=\"{}\"", color),

src/visualization/grapher.rs

@@ -161,20 +161,24 @@ pub(super) trait Grapher<'mir, 'tcx: 'mir> {
                     self.constructor().edges.insert(GraphEdge::Coupled {
                         source: input_nodes[i],
                         target: output_nodes[i],
+                        directed: true,
                     });
                     let mut j = i + 1;
                     while j < edge.num_coupled_nodes() {
                         self.constructor().edges.insert(GraphEdge::Coupled {
                             source: input_nodes[i],
                             target: output_nodes[j],
+                            directed: true,
                         });
                         self.constructor().edges.insert(GraphEdge::Coupled {
                             source: input_nodes[i],
                             target: input_nodes[j],
+                            directed: false,
                         });
                         self.constructor().edges.insert(GraphEdge::Coupled {
                             source: output_nodes[i],
                             target: output_nodes[j],
+                            directed: false,
                         });
                         j += 1;
                     }

src/visualization/mod.rs

@@ -191,6 +191,7 @@ pub(crate) enum GraphEdge {
     Coupled {
         source: NodeId,
         target: NodeId,
+        directed: bool,
     },
 }
 
@@ -200,7 +201,7 @@ impl GraphEdge {
             GraphEdge::Projection { source, target } => DotEdge {
                 from: source.to_string(),
                 to: target.to_string(),
-                options: EdgeOptions::undirected(),
+                options: EdgeOptions::directed(EdgeDirection::Forward),
             },
             GraphEdge::Alias {
                 blocked_place,
@@ -238,7 +239,7 @@ impl GraphEdge {
             } => DotEdge {
                 from: source.to_string(),
                 to: target.to_string(),
-                options: EdgeOptions::undirected()
+                options: EdgeOptions::directed(EdgeDirection::Forward)
                     .with_color("green".to_string())
                     .with_tooltip(path_conditions.clone()),
             },
@@ -264,13 +265,24 @@ impl GraphEdge {
                     .with_label(kind.clone())
                     .with_color("purple".to_string()),
             },
-            GraphEdge::Coupled { source, target } => DotEdge {
-                from: source.to_string(),
-                to: target.to_string(),
-                options: EdgeOptions::undirected()
-                    .with_color("red".to_string())
-                    .with_style("dashed".to_string()),
-            },
+            GraphEdge::Coupled {
+                source,
+                target,
+                directed,
+            } => {
+                let edge_options = if *directed {
+                    EdgeOptions::directed(EdgeDirection::Forward)
+                } else {
+                    EdgeOptions::undirected()
+                };
+                DotEdge {
+                    from: source.to_string(),
+                    to: target.to_string(),
+                    options: edge_options
+                        .with_color("red".to_string())
+                        .with_style("dashed".to_string()),
+                }
+            }
         }
     }
 }