Run rustfmt

benches/bench.rs

@@ -16,20 +16,28 @@ use test::Bencher;
 use obj::raw::parse_obj;
 
 fn load_file(filename: &str) -> Vec<u8> {
-    use std::path::Path;
     use std::fs::File;
     use std::io::Read;
+    use std::path::Path;
 
     let path = Path::new("tests").join("fixtures").join(filename);
     let mut file = match File::open(&path) {
         Ok(f) => f,
-        Err(e) => panic!("Failed to open \"{}\". \x1b[31m{}\x1b[0m", path.to_string_lossy(), e)
+        Err(e) => panic!(
+            "Failed to open \"{}\". \x1b[31m{}\x1b[0m",
+            path.to_string_lossy(),
+            e
+        ),
     };
 
     let mut data = Vec::new();
     match file.read_to_end(&mut data) {
-        Err(e) => panic!("Failed to read \"{}\". \x1b[31m{}\x1b[0m", path.to_string_lossy(), e),
-        Ok(_) => ()
+        Err(e) => panic!(
+            "Failed to read \"{}\". \x1b[31m{}\x1b[0m",
+            path.to_string_lossy(),
+            e
+        ),
+        Ok(_) => (),
     }
 
     data
@@ -39,7 +47,5 @@ fn load_file(filename: &str) -> Vec<u8> {
 fn sponza(b: &mut Bencher) {
     let data = load_file("sponza.obj");
     let mut data = std::io::Cursor::new(&data[..]);
-    b.iter(|| {
-        parse_obj(&mut data).unwrap()
-    });
+    b.iter(|| parse_obj(&mut data).unwrap());
 }

examples/glium.rs

@@ -13,22 +13,23 @@
 //!
 //!     cargo run --example glium --features glium-support
 
-#[macro_use] extern crate glium;
+#[macro_use]
+extern crate glium;
 extern crate obj;
 
 #[cfg(feature = "glium-support")]
 fn main() {
+    use glium::glutin::dpi::LogicalSize;
+    use glium::{glutin, Program};
+    use obj::*;
+    use std::default::Default;
     use std::fs::File;
     use std::io::BufReader;
-    use std::default::Default;
-    use obj::*;
-    use glium::{Program, glutin};
-    use glium::glutin::dpi::LogicalSize;
 
     let mut events_loop = glutin::EventsLoop::new();
 
     // building the display, ie. the main object
-    
+
     let window = glutin::WindowBuilder::new()
         .with_dimensions(LogicalSize::new(500.0, 400.0))
         .with_title("obj-rs");
@@ -43,7 +44,9 @@ fn main() {
     let vb = obj.vertex_buffer(&display).unwrap();
     let ib = obj.index_buffer(&display).unwrap();
 
-    let program = Program::from_source(&display, r#"
+    let program = Program::from_source(
+        &display,
+        r#"
         #version 410
 
         uniform mat4 matrix;
@@ -57,7 +60,8 @@ fn main() {
             gl_Position = matrix * vec4(position, 1.0);
             _normal = normalize(normal);
         }
-    "#, r#"
+    "#,
+        r#"
         #version 410
 
         uniform vec3 light;
@@ -68,7 +72,10 @@ fn main() {
         void main() {
             result = vec4(clamp(dot(_normal, -light), 0.0f, 1.0f) * vec3(1.0f, 0.93f, 0.56f), 1.0f);
         }
-    "#, None).unwrap();
+    "#,
+        None,
+    )
+    .unwrap();
 
     // drawing a frame
     let uniforms = uniform! {
@@ -107,19 +114,22 @@ fn main() {
         sleep(Duration::from_millis(17));
 
         // polling and handling the events received by the window
-        events_loop.poll_events(|event| {
-            match event {
-                glutin::Event::WindowEvent {event: glutin::WindowEvent::CloseRequested, ..} => running = false,
-                _ => ()
-            }
+        events_loop.poll_events(|event| match event {
+            glutin::Event::WindowEvent {
+                event: glutin::WindowEvent::CloseRequested,
+                ..
+            } => running = false,
+            _ => (),
         });
     }
 }
 
 #[cfg(not(feature = "glium-support"))]
 fn main() {
-    println!("\n\
+    println!(
+        "\n\
     Please execute it with \x1b[4m--features glium-support\x1b[24m the option
 
-    $ \x1b[33mcargo run --example glium --features glium-support\x1b[0m\n");
+    $ \x1b[33mcargo run --example glium --features glium-support\x1b[0m\n"
+    );
 }

src/error.rs

@@ -8,11 +8,11 @@
 
 //! Contains helper structs for error handling
 
-use std::fmt;
-use std::io;
-use std::num::{ParseIntError, ParseFloatError};
 use std::convert::From;
 use std::error::Error;
+use std::fmt;
+use std::io;
+use std::num::{ParseFloatError, ParseIntError};
 
 /// A type for results generated by `load_obj` and `load_mtl` where the `Err` type is hard-wired to
 /// `ObjError`
@@ -31,17 +31,17 @@ pub enum ObjError {
     /// Tried to parse floating point number frome the `obj` file, but failed.
     ParseFloat(ParseFloatError),
     /// `LoadError` has been occurred during parseing the `obj` file.
-    Load(LoadError)
+    Load(LoadError),
 }
 
 macro_rules! implmnt {
-    ($name:ident, $error:path) => (
+    ($name:ident, $error:path) => {
         impl From<$error> for ObjError {
             fn from(err: $error) -> Self {
                 ObjError::$name(err)
             }
         }
-    )
+    };
 }
 
 impl fmt::Display for ObjError {
@@ -105,7 +105,10 @@ pub enum LoadErrorKind {
 impl LoadError {
     /// Creates a new custom error from a specified kind/description.
     pub fn new(kind: LoadErrorKind, desc: &'static str) -> Self {
-        LoadError { kind: kind, desc: desc }
+        LoadError {
+            kind: kind,
+            desc: desc,
+        }
     }
 }
 
@@ -115,7 +118,9 @@ impl Error for LoadError {
             LoadErrorKind::UnexpectedStatement => "Met unexpected statement",
             LoadErrorKind::WrongNumberOfArguments => "Received wrong number of arguments",
             LoadErrorKind::WrongTypeOfArguments => "Received unexpected type of arguments",
-            LoadErrorKind::UntriangulatedModel => "Model should be triangulated first to be loaded properly",
+            LoadErrorKind::UntriangulatedModel => {
+                "Model should be triangulated first to be loaded properly"
+            }
             LoadErrorKind::InsufficientData => "Model cannot be transformed into requested form",
         }
     }
@@ -129,12 +134,9 @@ impl fmt::Display for LoadError {
 
 macro_rules! error {
     ($kind:ident, $desc:expr) => {
-        return Err(
-            ::std::convert::From::from(
-                $crate::error::LoadError::new(
-                    $crate::error::LoadErrorKind::$kind, $desc
-                )
-            )
-        )
-    }
+        return Err(::std::convert::From::from($crate::error::LoadError::new(
+            $crate::error::LoadErrorKind::$kind,
+            $desc,
+        )));
+    };
 }