From 7c2ee5ed128ee36103bee7326d716fba74bd5d6f Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 18 Nov 2015 09:33:06 -0500
Subject: [PATCH] Patch graphviz tests to account for the fact that nested
items are not listed (an improvement, I think).
---
src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot | 4 ++--
src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
index 78120e9009e..8ea42561332 100644
--- a/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
@@ -1,14 +1,14 @@
digraph block {
N0[label="entry"];
N1[label="exit"];
- N2[label="stmt fn inner(x: isize) -> isize { x + x }"];
+ N2[label="stmt "];
N3[label="expr inner"];
N4[label="expr inner"];
N5[label="expr 18"];
N6[label="expr inner(18)"];
N7[label="expr inner(inner(18))"];
N8[label="stmt inner(inner(18));"];
- N9[label="block {\l fn inner(x: isize) -> isize { x + x }\l inner(inner(18));\l}\l"];
+ N9[label="block { inner(inner(18)); }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
diff --git a/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
index 4752eac3e28..bc0ca08d422 100644
--- a/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
@@ -1,8 +1,8 @@
digraph block {
N0[label="entry"];
N1[label="exit"];
- N2[label="stmt struct S19 {\l x: isize,\l}\l"];
- N3[label="stmt impl S19 {\l fn inner(self) -> S19 { S19{x: self.x + self.x,} }\l}\l"];
+ N2[label="stmt "];
+ N3[label="stmt "];
N4[label="expr 19"];
N5[label="expr S19{x: 19,}"];
N6[label="local s"];
@@ -11,7 +11,7 @@ digraph block {
N9[label="expr s.inner()"];
N10[label="expr s.inner().inner()"];
N11[label="stmt s.inner().inner();"];
- N12[label="block {\l struct S19 {\l x: isize,\l }\l impl S19 {\l fn inner(self) -> S19 { S19{x: self.x + self.x,} }\l }\l let s = S19{x: 19,};\l s.inner().inner();\l}\l"];
+ N12[label="block { let s = S19{x: 19,}; s.inner().inner(); }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;