Remove unecessary Readers and Writers

These types now implement Read and Write, so the
extra BufReaders and BufWriter structs are not
required. Not sure if this makes any difference to
performance.

Author: brendanzab

gl/build.rs

@@ -17,14 +17,12 @@ extern crate gl_generator;
 use gl_generator::{Fallbacks, GlobalGenerator, Api, Profile};
 use std::env;
 use std::fs::File;
-use std::io::BufWriter;
 use std::path::Path;
 
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
-    let dest = Path::new(&out_dir);
+    let mut file = File::create(&Path::new(&out_dir).join("bindings.rs")).unwrap();
 
-    let mut file = BufWriter::new(File::create(&dest.join("bindings.rs")).unwrap());
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
                                     vec![], "4.5", Profile::Core, &mut file).unwrap();
 }

gl_generator/README.md

@@ -36,14 +36,12 @@ extern crate gl_generator;
 use gl_generator::{Fallbacks, GlobalGenerator, Api, Profile};
 use std::env;
 use std::fs::File;
-use std::io::BufWriter;
 use std::path::Path;
 
 fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let dest = Path::new(&out_dir);
+    let dest = env::var("OUT_DIR").unwrap();
+    let mut file = File::create(&Path::new(&dest).join("bindings.rs")).unwrap();
 
-    let mut file = BufWriter::new(File::create(&dest.join("bindings.rs")).unwrap());
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
                                     vec![], "4.5", Profile::Core, &mut file).unwrap();
 }

gl_generator/lib.rs

@@ -132,17 +132,14 @@ pub fn generate_bindings<G, W>(generator: G, api: Api, fallbacks: Fallbacks,
 
     // Generate the registry of all bindings
     let registry = {
-        use std::io::BufReader;
-
         let src = match api {
             Api::Gl | Api::GlCore | Api::Gles1 | Api::Gles2 => khronos_api::GL_XML,
             Api::Glx => khronos_api::GLX_XML,
             Api::Wgl => khronos_api::WGL_XML,
             Api::Egl => khronos_api::EGL_XML,
         };
 
-        let reader = BufReader::new(src);
-        Registry::from_xml(reader, api, filter)
+        Registry::from_xml(src, api, filter)
     };
 
     generator.write(&registry, dest)

gl_generator/registry.rs

@@ -99,9 +99,6 @@ pub struct Registry {
 impl Registry {
     /// Generate a registry from the supplied XML string
     pub fn from_xml<R: io::Read>(data: R, api: Api, filter: Filter) -> Registry {
-        use std::io::BufReader;
-        let data = BufReader::new(data);
-
         RegistryBuilder {
             api: api,
             reader: XmlEventReader::new(data),

gl_tests/test_gen_symbols/build.rs

@@ -17,13 +17,12 @@ extern crate gl_generator;
 use gl_generator::*;
 use std::env;
 use std::fs::File;
-use std::io::BufWriter;
 use std::io::prelude::*;
 use std::path::*;
 
 fn main() {
     let dest = env::var("OUT_DIR").unwrap();
-    let mut file = BufWriter::new(File::create(&Path::new(&dest).join("test_gen_symbols.rs")).unwrap());
+    let mut file = File::create(&Path::new(&dest).join("test_gen_symbols.rs")).unwrap();
 
     writeln!(&mut file, "mod gl {{").unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,

gl_tests/test_no_warnings/build.rs

@@ -17,13 +17,12 @@ extern crate gl_generator;
 use gl_generator::*;
 use std::env;
 use std::fs::File;
-use std::io::BufWriter;
 use std::io::prelude::*;
 use std::path::*;
 
 fn main() {
     let dest = env::var("OUT_DIR").unwrap();
-    let mut file = BufWriter::new(File::create(&Path::new(&dest).join("test_no_warnings.rs")).unwrap());
+    let mut file = File::create(&Path::new(&dest).join("test_no_warnings.rs")).unwrap();
 
     // Gl
 

gl_tests/test_symbols/build.rs

@@ -17,12 +17,11 @@ extern crate gl_generator;
 use gl_generator::*;
 use std::env;
 use std::fs::File;
-use std::io::BufWriter;
 use std::path::*;
 
 fn main() {
     let dest = env::var("OUT_DIR").unwrap();
-    let mut file = BufWriter::new(File::create(&Path::new(&dest).join("test_symbols.rs")).unwrap());
+    let mut file = File::create(&Path::new(&dest).join("test_symbols.rs")).unwrap();
 
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
                                     vec![], "4.5", Profile::Core, &mut file).unwrap();