Run rustfmt.

rustfmt.toml

@@ -0,0 +1,3 @@
+#indent_style = "Block"
+#where_single_line = true
+#brace_style = "PreferSameLine"

src/builtin/normals_material.rs

@@ -1,10 +1,10 @@
 use crate::camera::Camera;
 use crate::context::Context;
 use crate::light::Light;
-use na::{Isometry3, Matrix3, Matrix4, Point3, Vector3};
 use crate::resource::Material;
 use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform};
 use crate::scene::ObjectData;
+use na::{Isometry3, Matrix3, Matrix4, Point3, Vector3};
 
 #[path = "../error.rs"]
 mod error;

src/builtin/object_material.rs

@@ -1,10 +1,10 @@
 use crate::camera::Camera;
 use crate::context::Context;
 use crate::light::Light;
-use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3};
 use crate::resource::Material;
 use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform};
 use crate::scene::ObjectData;
+use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3};
 
 #[path = "../error.rs"]
 mod error;

src/builtin/planar_object_material.rs

@@ -1,9 +1,9 @@
 use crate::context::Context;
-use na::{Isometry2, Matrix2, Matrix3, Point2, Point3, Vector2};
 use crate::planar_camera::PlanarCamera;
 use crate::resource::PlanarMaterial;
 use crate::resource::{Effect, PlanarMesh, ShaderAttribute, ShaderUniform};
 use crate::scene::PlanarObjectData;
+use na::{Isometry2, Matrix2, Matrix3, Point2, Point3, Vector2};
 
 #[path = "../error.rs"]
 mod error;

src/builtin/uvs_material.rs

@@ -1,10 +1,10 @@
 use crate::camera::Camera;
 use crate::context::Context;
 use crate::light::Light;
-use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3};
 use crate::resource::Material;
 use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform};
 use crate::scene::ObjectData;
+use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3};
 
 #[path = "../error.rs"]
 mod error;

src/camera/arc_ball.rs

@@ -1,9 +1,9 @@
 use crate::camera::Camera;
 use crate::event::{Action, Key, Modifiers, MouseButton, WindowEvent};
-use na::{self, Isometry3, Matrix4, Perspective3, Point3, Unit, UnitQuaternion, Vector2, Vector3};
 use crate::resource::ShaderUniform;
-use std::f32;
 use crate::window::Canvas;
+use na::{self, Isometry3, Matrix4, Perspective3, Point3, Unit, UnitQuaternion, Vector2, Vector3};
+use std::f32;
 
 /// Arc-ball camera mode.
 ///

src/camera/camera.rs

@@ -1,7 +1,7 @@
 use crate::event::WindowEvent;
-use na::{Isometry3, Matrix4, Point2, Point3, Point4, Vector2, Vector3};
 use crate::resource::ShaderUniform;
 use crate::window::Canvas;
+use na::{Isometry3, Matrix4, Point2, Point3, Point4, Vector2, Vector3};
 
 /// Trait every camera must implement.
 pub trait Camera {

src/camera/first_person.rs

@@ -1,13 +1,13 @@
 use crate::camera::Camera;
 use crate::event::{Action, Key, MouseButton, WindowEvent};
+use crate::resource::ShaderUniform;
+use crate::window::Canvas;
 use na::{
     self, Isometry3, Matrix4, Perspective3, Point3, Translation3, Unit, UnitQuaternion, Vector2,
     Vector3,
 };
 use num::Zero;
-use crate::resource::ShaderUniform;
 use std::f32;
-use crate::window::Canvas;
 
 /// First-person camera mode.
 ///

src/camera/fixed_view.rs

@@ -1,9 +1,9 @@
 use crate::camera::Camera;
 use crate::event::WindowEvent;
-use na::{self, Isometry3, Matrix4, Perspective3, Point3};
 use crate::resource::ShaderUniform;
-use std::f32;
 use crate::window::Canvas;
+use na::{self, Isometry3, Matrix4, Perspective3, Point3};
+use std::f32;
 
 /// A camera that cannot move.
 #[derive(Clone, Debug)]

src/loader/obj.rs

@@ -2,10 +2,10 @@
 
 use crate::loader::mtl;
 use crate::loader::mtl::MtlMaterial;
-use na::{Point2, Point3, Vector3};
-use num::Bounded;
 use crate::resource::GPUVec;
 use crate::resource::{AllocationType, BufferType, Mesh};
+use na::{Point2, Point3, Vector3};
+use num::Bounded;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
 use std::fs::File;

src/planar_camera/fixed_view.rs

@@ -1,9 +1,9 @@
 use crate::event::WindowEvent;
-use na::{self, Matrix3, Point2, Vector2, Vector3};
 use crate::planar_camera::PlanarCamera;
 use crate::resource::ShaderUniform;
-use std::f32;
 use crate::window::Canvas;
+use na::{self, Matrix3, Point2, Vector2, Vector3};
+use std::f32;
 
 /// A camera that cannot move.
 #[derive(Clone, Debug)]

src/planar_camera/planar_camera.rs

@@ -1,7 +1,7 @@
 use crate::event::WindowEvent;
-use na::{Matrix3, Point2, Vector2};
 use crate::resource::ShaderUniform;
 use crate::window::Canvas;
+use na::{Matrix3, Point2, Vector2};
 
 /// Trait every 2D camera must implement.
 pub trait PlanarCamera {

src/planar_camera/sidescroll.rs

@@ -1,10 +1,10 @@
 use crate::event::{Action, MouseButton, WindowEvent};
-use na::{self, Matrix3, Point2, Translation2, Vector2};
-use num::Pow;
 use crate::planar_camera::PlanarCamera;
 use crate::resource::ShaderUniform;
-use std::f32;
 use crate::window::Canvas;
+use na::{self, Matrix3, Point2, Translation2, Vector2};
+use num::Pow;
+use std::f32;
 
 /// A 2D camera that can be zoomed and panned.
 #[derive(Clone, Debug)]

src/planar_line_renderer.rs

@@ -1,9 +1,9 @@
 //! A batched line renderer.
 
 use crate::context::Context;
-use na::{Matrix3, Point2, Point3};
 use crate::planar_camera::PlanarCamera;
 use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform};
+use na::{Matrix3, Point2, Point3};
 
 #[path = "error.rs"]
 mod error;

src/renderer/conrod_renderer.rs

@@ -1,15 +1,15 @@
 //! A renderer for Conrod primitives.
 
+use crate::context::{Context, Texture};
+use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform};
+use crate::text::Font;
 use conrod::position::Rect;
 use conrod::text::GlyphCache;
 use conrod::{render::PrimitiveKind, Ui};
-use crate::context::{Context, Texture};
 use na::{Point2, Point3, Point4, Vector2};
-use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform};
 use rusttype::gpu_cache::Cache;
 use std::collections::HashMap;
 use std::rc::Rc;
-use crate::text::Font;
 
 #[path = "../error.rs"]
 mod error;

src/renderer/line_renderer.rs

@@ -2,9 +2,9 @@
 
 use crate::camera::Camera;
 use crate::context::Context;
-use na::{Matrix4, Point3};
 use crate::renderer::Renderer;
 use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform};
+use na::{Matrix4, Point3};
 
 #[path = "../error.rs"]
 mod error;

src/renderer/point_renderer.rs

@@ -2,9 +2,9 @@
 
 use crate::camera::Camera;
 use crate::context::Context;
-use na::{Matrix4, Point3};
 use crate::renderer::Renderer;
 use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform};
+use na::{Matrix4, Point3};
 
 #[path = "../error.rs"]
 mod error;

src/resource/material.rs

@@ -2,10 +2,10 @@
 
 use crate::camera::Camera;
 use crate::light::Light;
-use na::{Isometry2, Isometry3, Vector2, Vector3};
 use crate::planar_camera::PlanarCamera;
 use crate::resource::{Mesh, PlanarMesh};
 use crate::scene::{ObjectData, PlanarObjectData};
+use na::{Isometry2, Isometry3, Vector2, Vector3};
 
 /// Trait implemented by materials.
 pub trait Material {

src/resource/mesh.rs

@@ -2,11 +2,11 @@
 use std::iter;
 use std::sync::{Arc, RwLock};
 
+use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec};
+use crate::resource::ShaderAttribute;
 use na::{self, Point2, Point3, Vector3};
 use ncollide3d::procedural::{IndexBuffer, TriMesh};
 use num::Zero;
-use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec};
-use crate::resource::ShaderAttribute;
 
 #[path = "../error.rs"]
 mod error;

src/resource/mesh_manager.rs

@@ -2,9 +2,9 @@
 
 use crate::loader::mtl::MtlMaterial;
 use crate::loader::obj;
+use crate::resource::Mesh;
 use ncollide3d::procedural;
 use ncollide3d::procedural::TriMesh;
-use crate::resource::Mesh;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::io::Result as IoResult;

src/resource/mod.rs

@@ -2,7 +2,9 @@
 
 pub use crate::context::Texture;
 pub use crate::resource::effect::{Effect, ShaderAttribute, ShaderUniform};
-pub use crate::resource::framebuffer_manager::{FramebufferManager, OffscreenBuffers, RenderTarget};
+pub use crate::resource::framebuffer_manager::{
+    FramebufferManager, OffscreenBuffers, RenderTarget,
+};
 pub use crate::resource::gl_primitive::{GLPrimitive, PrimitiveArray};
 pub use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec};
 pub use crate::resource::material::{Material, PlanarMaterial};

src/resource/planar_mesh.rs

@@ -2,9 +2,9 @@
 use std::iter;
 use std::sync::{Arc, RwLock};
 
-use na::{Point2, Point3};
 use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec};
 use crate::resource::ShaderAttribute;
+use na::{Point2, Point3};
 
 #[path = "../error.rs"]
 mod error;

src/scene/object.rs

@@ -2,8 +2,8 @@
 
 use crate::camera::Camera;
 use crate::light::Light;
-use na::{Isometry3, Point2, Point3, Vector3};
 use crate::resource::{Material, Mesh, Texture, TextureManager};
+use na::{Isometry3, Point2, Point3, Vector3};
 use std::any::Any;
 use std::cell::RefCell;
 use std::path::Path;

src/scene/planar_object.rs

@@ -1,8 +1,8 @@
 //! Data structure of a scene node.
 
-use na::{Isometry2, Point2, Point3, Vector2};
 use crate::planar_camera::PlanarCamera;
 use crate::resource::{PlanarMaterial, PlanarMesh, Texture, TextureManager};
+use na::{Isometry2, Point2, Point3, Vector2};
 use std::any::Any;
 use std::cell::RefCell;
 use std::path::Path;

src/scene/scene_node.rs

@@ -1,11 +1,11 @@
 use crate::camera::Camera;
 use crate::light::Light;
+use crate::resource::{Material, MaterialManager, Mesh, MeshManager, Texture, TextureManager};
+use crate::scene::Object;
 use na;
 use na::{Isometry3, Point2, Point3, Translation3, UnitQuaternion, Vector3};
 use ncollide3d::procedural;
 use ncollide3d::procedural::TriMesh;
-use crate::resource::{Material, MaterialManager, Mesh, MeshManager, Texture, TextureManager};
-use crate::scene::Object;
 use std::cell::{Ref, RefCell, RefMut};
 use std::mem;
 use std::path::{Path, PathBuf};