Manual fixups for libgraphviz

(Actually mostly not manual, comes from fixing rustfmt, but some are manual).

Author: nrc

src/libgraphviz/lib.rs

@@ -539,7 +539,7 @@ pub fn default_options() -> Vec<RenderOption> {
 
 /// Renders directed graph `g` into the writer `w` in DOT syntax.
 /// (Simple wrapper around `render_opts` that passes a default set of options.)
-pub fn render<'a, N: Clone, 'a, E: Clone, 'a, G: Labeller<'a, N, E>, GraphWalk<'a, N, E>, W: Write>
+pub fn render<'a, N: Clone+'a, E: Clone+'a, G: Labeller<'a, N, E>+GraphWalk<'a, N, E>, W: Write>
     (g: &'a G,
      w: &mut W)
      -> io::Result<()> {
@@ -549,9 +549,9 @@ pub fn render<'a, N: Clone, 'a, E: Clone, 'a, G: Labeller<'a, N, E>, GraphWalk<'
 /// Renders directed graph `g` into the writer `w` in DOT syntax.
 /// (Main entry point for the library.)
 pub fn render_opts<'a,
-                   N: Clone, 'a,
-                   E: Clone, 'a,
-                   G: Labeller<'a, N, E>, GraphWalk<'a, N, E>,
+                   N: Clone+'a,
+                   E: Clone+'a,
+                   G: Labeller<'a, N, E>+GraphWalk<'a, N, E>,
                    W: Write>
     (g: &'a G,
      w: &mut W,
@@ -835,8 +835,10 @@ r#"digraph single_cyclic_node {
         let labels = AllNodesLabelled(vec!("{x,y}", "{x}", "{y}", "{}"));
         let r = test_input(LabelledGraph::new("hasse_diagram",
                                               labels,
-                                              vec!(edge(0, 1, ""), edge(0, 2, ""),
-                 edge(1, 3, ""), edge(2, 3, ""))));
+                                              vec!(edge(0, 1, ""),
+                                                   edge(0, 2, ""),
+                                                   edge(1, 3, ""),
+                                                   edge(2, 3, ""))));
         assert_eq!(r.unwrap(),
 r#"digraph hasse_diagram {
     N0[label="{x,y}"];
@@ -869,8 +871,10 @@ r#"digraph hasse_diagram {
 
         let g = LabelledGraphWithEscStrs::new("syntax_tree",
                                               labels,
-                                              vec!(edge(0, 1, "then"), edge(0, 2, "else"),
-                 edge(1, 3, ";"),    edge(2, 3, ";"   )));
+                                              vec!(edge(0, 1, "then"),
+                                                   edge(0, 2, "else"),
+                                                   edge(1, 3, ";"),
+                                                   edge(2, 3, ";"   )));
 
         render(&g, &mut writer).unwrap();
         let mut r = String::new();