]> git.lizzy.rs Git - rust.git/commitdiff
Merge pull request #20457 from frewsxcv/rm-reexports
authorbors <bors@rust-lang.org>
Sun, 4 Jan 2015 21:36:36 +0000 (21:36 +0000)
committerbors <bors@rust-lang.org>
Sun, 4 Jan 2015 21:36:36 +0000 (21:36 +0000)
Remove graphviz::LabelText::* public reexport

Reviewed-by: cmr
1  2 
src/libgraphviz/lib.rs
src/librustc_borrowck/graphviz.rs

index f151102f28629992e50f398ffdd034bce1ee8e0e,e3316b1251d92fa492353960522106bf11bf0fd2..e3bcf70e8c82ffa833368efa65c3497587cde717
@@@ -586,11 -586,11 +586,11 @@@ pub fn render_opts<'a, N:Clone+'a, E:Cl
  #[cfg(test)]
  mod tests {
      use self::NodeLabels::*;
-     use super::{Id, LabelText, LabelStr, EscStr, Labeller};
-     use super::{Nodes, Edges, GraphWalk, render};
+     use super::{Id, Labeller, Nodes, Edges, GraphWalk, render};
+     use super::LabelText::{mod, LabelStr, EscStr};
      use std::io::IoResult;
 -    use std::str;
      use std::borrow::IntoCow;
 +    use std::iter::repeat;
  
      /// each node is an index in a vector in the graph.
      type Node = uint;
Simple merge