Result<(Builder, Option<Box<io::Write>>), io::Error>

- just another progress check-in
- the Option is probably unnecessary

Author: jdub

src/bin/bindgen.rs

@@ -66,13 +66,16 @@ pub fn main() {
         }
     }
 
-    if let Ok(builder) = bindgen::builder_from_flags(env::args()) {
+    if let Ok((builder, Some(output))) = bindgen::builder_from_flags(env::args()) {
         //println!("{:#?}", builder);
 
         let bindings = builder.generate()
             .expect("Unable to generate bindings");
 
-        println!("{}", bindings.to_string());
+        if let Err(error) = bindings.write(output) {
+            println!("{:#?}", error);
+            std::process::exit(1);
+        }
     }
 
 /*

src/lib.rs

@@ -125,7 +125,7 @@ pub fn builder() -> Builder {
 }
 
 /// Construct a new [`Builder`](./struct.Builder.html) from command line flags.
-pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
+pub fn builder_from_flags<I>(args: I) -> Result<(Builder, Option<Box<io::Write>>), io::Error>
     where I: Iterator<Item=String>
 {
     let matches = App::new("bindgen")
@@ -346,15 +346,14 @@ pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
         }
     }
 
-    // FIXME: hrrrmmm
-    let _output = if let Some(path) = matches.value_of("output") {
+    let output = if let Some(path) = matches.value_of("output") {
         let file = try!(File::create(path));
         Box::new(io::BufWriter::new(file)) as Box<io::Write>
     } else {
         Box::new(io::BufWriter::new(io::stdout())) as Box<io::Write>
     };
 
-    Ok(builder)
+    Ok((builder, Some(output)))
 }
 
 impl Builder {