Mior

3 files changed, 50 insertions, 52 deletions

diff --git a/src/bin/cli/parse.rs b/src/bin/cli.rs
index 563ea92f6..9e513edb2 100644
--- a/src/bin/cli/parse.rs
+++ b/src/bin/cli.rs
@@ -3,13 +3,13 @@ extern crate libsyntax2;
 use std::io::Read;
 
 use libsyntax2::{
-    parse, utils::dump_tree_green
+    parse, utils::dump_tree
 };
 
 fn main() {
     let text = read_input();
     let file = parse(text);
-    let tree = dump_tree_green(&file);
+    let tree = dump_tree(&file);
     println!("{}", tree);
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index 91d060169..f85ee1eef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,6 +27,8 @@ mod lexer;
 mod parser;
 mod syntax_kinds;
 mod yellow;
+/// Utilities for simple uses of the parser.
+pub mod utils;
 
 pub use {
     lexer::{tokenize, Token},
@@ -42,53 +44,3 @@ pub fn parse(text: String) -> SyntaxNode {
     parser::parse::<yellow::GreenBuilder>(text, &tokens)
 }
 
-/// Utilities for simple uses of the parser.
-pub mod utils {
-    use std::{collections::BTreeSet, fmt::Write};
-
-    use {SyntaxError, SyntaxNode, SyntaxNodeRef};
-
-    /// Parse a file and create a string representation of the resulting parse tree.
-    pub fn dump_tree_green(syntax: &SyntaxNode) -> String {
-        let syntax = syntax.borrow();
-        let mut errors: BTreeSet<_> = syntax.root.errors.iter().cloned().collect();
-        let mut result = String::new();
-        go(syntax, &mut result, 0, &mut errors);
-        return result;
-
-        fn go(
-            node: SyntaxNodeRef,
-            buff: &mut String,
-            level: usize,
-            errors: &mut BTreeSet<SyntaxError>,
-        ) {
-            buff.push_str(&String::from("  ").repeat(level));
-            write!(buff, "{:?}\n", node).unwrap();
-            let my_errors: Vec<_> = errors
-                .iter()
-                .filter(|e| e.offset == node.range().start())
-                .cloned()
-                .collect();
-            for err in my_errors {
-                errors.remove(&err);
-                buff.push_str(&String::from("  ").repeat(level));
-                write!(buff, "err: `{}`\n", err.message).unwrap();
-            }
-
-            for child in node.children() {
-                go(child, buff, level + 1, errors)
-            }
-
-            let my_errors: Vec<_> = errors
-                .iter()
-                .filter(|e| e.offset == node.range().end())
-                .cloned()
-                .collect();
-            for err in my_errors {
-                errors.remove(&err);
-                buff.push_str(&String::from("  ").repeat(level));
-                write!(buff, "err: `{}`\n", err.message).unwrap();
-            }
-        }
-    }
-}
diff --git a/src/utils.rs b/src/utils.rs
new file mode 100644
index 000000000..20991659a
--- /dev/null
+++ b/src/utils.rs
@@ -0,0 +1,46 @@
+use std::{collections::BTreeSet, fmt::Write};
+use {SyntaxError, SyntaxNode, SyntaxNodeRef};
+
+/// Parse a file and create a string representation of the resulting parse tree.
+pub fn dump_tree(syntax: &SyntaxNode) -> String {
+    let syntax = syntax.borrow();
+    let mut errors: BTreeSet<_> = syntax.root.errors.iter().cloned().collect();
+    let mut result = String::new();
+    go(syntax, &mut result, 0, &mut errors);
+    return result;
+
+    fn go(
+        node: SyntaxNodeRef,
+        buff: &mut String,
+        level: usize,
+        errors: &mut BTreeSet<SyntaxError>,
+    ) {
+        buff.push_str(&String::from("  ").repeat(level));
+        write!(buff, "{:?}\n", node).unwrap();
+        let my_errors: Vec<_> = errors
+            .iter()
+            .filter(|e| e.offset == node.range().start())
+            .cloned()
+            .collect();
+        for err in my_errors {
+            errors.remove(&err);
+            buff.push_str(&String::from("  ").repeat(level));
+            write!(buff, "err: `{}`\n", err.message).unwrap();
+        }
+
+        for child in node.children() {
+            go(child, buff, level + 1, errors)
+        }
+
+        let my_errors: Vec<_> = errors
+            .iter()
+            .filter(|e| e.offset == node.range().end())
+            .cloned()
+            .collect();
+        for err in my_errors {
+            errors.remove(&err);
+            buff.push_str(&String::from("  ").repeat(level));
+            write!(buff, "err: `{}`\n", err.message).unwrap();
+        }
+    }
+}