Move box_option to parser

Signed-off-by: Sean Young <sean@mess.org>

src/ast.rs

@@ -386,10 +386,3 @@ mod test {
         assert_eq!(e, a);
     }
 }
-
-pub fn box_option<T>(o: Option<T>) -> Option<Box<T>> {
-    match o {
-        None => None,
-        Some(x) => Some(Box::new(x))
-    }
-}

src/main.rs

@@ -23,7 +23,7 @@ mod emit;
 mod link;
 mod test;
 mod output;
-mod parse;
+mod parser;
 mod cfg;
 
 use std::fs::File;
@@ -88,7 +88,7 @@ fn main() {
         f.read_to_string(&mut contents)
             .expect("something went wrong reading the file");
 
-        let mut past = match parse::parse(&contents) {
+        let mut past = match parser::parse(&contents) {
             Ok(s) => s,
             Err(errors) => {
                 if matches.is_present("JSON") {

src/parse.rs → src/parser.rs

@@ -83,6 +83,13 @@ fn strip_comments(s: &str) -> String {
     n
 }
 
+pub fn box_option<T>(o: Option<T>) -> Option<Box<T>> {
+    match o {
+        None => None,
+        Some(x) => Some(Box::new(x))
+    }
+}
+
 #[test]
 fn strip_comments_test() {
     assert_eq!(strip_comments(&("foo //Zabc\nbar".to_string())),

src/solidity.lalrpop

@@ -2,6 +2,7 @@
 use std::str::FromStr;
 use num_bigint::BigInt;
 use ast::*;
+use parser::box_option;
 
 grammar;
 

src/test.rs

@@ -1,7 +1,7 @@
 
 #[cfg(test)]
 mod tests {
-    use parse;
+    use parser;
     use resolver;
     use emit;
     use link;
@@ -9,7 +9,7 @@ mod tests {
     use std::mem;
 
     fn build_solidity(src: &'static str) -> (ModuleRef, String) {
-        let s = parse::parse(src).expect("parse should succeed");
+        let s = parser::parse(src).expect("parse should succeed");
         
         // resolve
         let (contracts, _errors) = resolver::resolver(s);
@@ -241,4 +241,4 @@ contract test {
             }
         }
     }
-}
+}