cargo fmt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nobject-rs"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["shmapdy <[email protected]>"]
 edition = "2018"
 license = "MIT"

src/test/mtl.rs

@@ -1,17 +1,9 @@
 use crate::{
     material::{
-        BumpMap,
-        ColorCorrectedMap,
-        ColorType,
-        DisolveType,
-        Material,
-        NonColorCorrectedMap,
+        BumpMap, ColorCorrectedMap, ColorType, DisolveType, Material, NonColorCorrectedMap,
         ReflectionMap,
     },
-    tokenizer::{
-        parse_mtl,
-        Token,
-    },
+    tokenizer::{parse_mtl, Token},
 };
 
 #[test]
@@ -413,7 +405,7 @@ parse_material_test!(
         }),
         bump_map: Some(BumpMap {
             bump_multiplier: Some(2.0),
-            map_settings:    Some(NonColorCorrectedMap {
+            map_settings: Some(NonColorCorrectedMap {
                 file_name: "leath.mpb".into(),
                 ..Default::default()
             }),
@@ -473,7 +465,7 @@ parse_material_test!(
         illumination_mode: Some(1),
         reflection_map: Some(ReflectionMap {
             reflection_type: "sphere".into(),
-            map_settings:    Some(ColorCorrectedMap {
+            map_settings: Some(ColorCorrectedMap {
                 file_name: "chrome.rla".into(),
                 ..Default::default()
             }),

src/test/obj.rs

@@ -1,7 +1,6 @@
-use crate::model::ModelElement;
 use crate::{
     model,
-    model::{Face, FaceElement, Vertex},
+    model::{Face, FaceElement, ModelElement, Vertex},
     tokenizer::{parse_obj, Token},
     Line, LineElement, Point, Texture,
 };

src/tokenizer/mtl.rs

@@ -2,28 +2,14 @@ use std::result::Result;
 
 use nom::{
     branch::alt,
-    bytes::complete::{
-        is_not,
-        tag,
-        tag_no_case,
-    },
-    character::complete::{
-        line_ending,
-        multispace0,
-        multispace1,
-    },
+    bytes::complete::{is_not, tag, tag_no_case},
+    character::complete::{line_ending, multispace0, multispace1},
     combinator::map,
     multi::fold_many0,
-    sequence::{
-        delimited,
-        preceded,
-    },
+    sequence::{delimited, preceded},
 };
 
-use super::{
-    Token,
-    TokenizeError,
-};
+use super::{Token, TokenizeError};
 
 pub fn parse_mtl(input: &str) -> Result<Vec<Token>, TokenizeError> {
     match fold_many0(