diff options
| author | Rich Kadel <richkadel@google.com> | 2020-09-09 14:49:32 -0700 |
|---|---|---|
| committer | Rich Kadel <richkadel@google.com> | 2020-09-09 14:49:32 -0700 |
| commit | f7aee330c70ef787d2224adb49804343978dd145 (patch) | |
| tree | f5c6d68e079b78d5c155a68a5f27b2718289ab9f | |
| parent | c19b2370e419c0be7b46cc9ae7767773560a072c (diff) | |
| download | rust-f7aee330c70ef787d2224adb49804343978dd145.tar.gz rust-f7aee330c70ef787d2224adb49804343978dd145.zip | |
Also fixed monospace font for d3-graphviz engine
VS code graphviz extensions use d3-graphviz, which supports `Courier` fontname but does not support `monospace`. This caused graphs to render poorly because the text sizes were wrong.
| -rw-r--r-- | compiler/rustc_graphviz/src/lib.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_mir/src/util/graphviz.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/graphviz.main.mir_map.0.dot | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_graphviz/src/lib.rs b/compiler/rustc_graphviz/src/lib.rs index 252e3416865..29ec3572016 100644 --- a/compiler/rustc_graphviz/src/lib.rs +++ b/compiler/rustc_graphviz/src/lib.rs @@ -634,7 +634,7 @@ where let mut graph_attrs = Vec::new(); let mut content_attrs = Vec::new(); if options.contains(&RenderOption::Monospace) { - let font = r#"fontname="monospace""#; + let font = r#"fontname="Courier, monospace""#; graph_attrs.push(font); content_attrs.push(font); }; diff --git a/compiler/rustc_mir/src/util/graphviz.rs b/compiler/rustc_mir/src/util/graphviz.rs index bc1e3fa8b29..e89c9437706 100644 --- a/compiler/rustc_mir/src/util/graphviz.rs +++ b/compiler/rustc_mir/src/util/graphviz.rs @@ -55,7 +55,7 @@ where writeln!(w, "{} {}Mir_{} {{", kind, cluster, def_name)?; // Global graph properties - let font = r#"fontname="monospace""#; + let font = r#"fontname="Courier, monospace""#; let mut graph_attrs = vec![font]; let mut content_attrs = vec![font]; diff --git a/src/test/mir-opt/graphviz.main.mir_map.0.dot b/src/test/mir-opt/graphviz.main.mir_map.0.dot index f5d8b84812a..df4f11f0f21 100644 --- a/src/test/mir-opt/graphviz.main.mir_map.0.dot +++ b/src/test/mir-opt/graphviz.main.mir_map.0.dot @@ -1,7 +1,7 @@ digraph Mir_0_3 { - graph [fontname="monospace"]; - node [fontname="monospace"]; - edge [fontname="monospace"]; + graph [fontname="Courier, monospace"]; + node [fontname="Courier, monospace"]; + edge [fontname="Courier, monospace"]; label=<fn main() -> ()<br align="left"/>>; bb0__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">0</td></tr><tr><td align="left" balign="left">_0 = const ()<br/></td></tr><tr><td align="left">goto</td></tr></table>>]; bb1__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">1</td></tr><tr><td align="left">resume</td></tr></table>>]; |