Merge pull request #62 from redpenguinyt/master

Updated ahash to 0.8.7 (0.8.3 has been yanked) and made clippy happy
Twinklebear · Jan 20, 2024 · 552ba7e · 552ba7e
2 parents 85c04c4 + 80743a4
commit 552ba7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ use_f64 = []
 
 [dependencies]
 arbitrary = { version = "1.3.0", optional = true }
-ahash = { version = "0.8.3", optional = true }
+ahash = { version = "0.8.7", optional = true }
 log = { version = "0.4.17", optional = true }
 
 [dev-dependencies]

diff --git a/examples/print_mesh.rs b/examples/print_mesh.rs
@@ -1,11 +1,10 @@
 fn main() {
     let obj_file = std::env::args()
-        .skip(1)
-        .next()
+        .nth(1)
         .expect("A .obj file to print is required");
 
     let (models, materials) =
-        tobj::load_obj(&obj_file, &tobj::LoadOptions::default()).expect("Failed to OBJ load file");
+        tobj::load_obj(obj_file, &tobj::LoadOptions::default()).expect("Failed to OBJ load file");
 
     // Note: If you don't mind missing the materials, you can generate a default.
     let materials = materials.expect("Failed to load MTL file");
@@ -15,7 +14,7 @@ fn main() {
 
     for (i, m) in models.iter().enumerate() {
         let mesh = &m.mesh;
-        println!("");
+        println!();
         println!("model[{}].name             = \'{}\'", i, m.name);
         println!("model[{}].mesh.material_id = {:?}", i, mesh.material_id);
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -931,7 +931,7 @@ fn export_faces(
             }
             Face::Polygon(ref indices) => {
                 if load_options.triangulate {
-                    let a = indices.get(0).ok_or(LoadError::InvalidPolygon)?;
+                    let a = indices.first().ok_or(LoadError::InvalidPolygon)?;
                     let mut b = indices.get(1).ok_or(LoadError::InvalidPolygon)?;
                     for c in indices.iter().skip(2) {
                         add_vertex(&mut mesh, &mut index_map, a, pos, v_color, texcoord, normal)?;
@@ -1327,7 +1327,7 @@ fn export_faces_multi_index(
             }
             Face::Polygon(ref indices) => {
                 if load_options.triangulate {
-                    let a = indices.get(0).ok_or(LoadError::InvalidPolygon)?;
+                    let a = indices.first().ok_or(LoadError::InvalidPolygon)?;
                     let mut b = indices.get(1).ok_or(LoadError::InvalidPolygon)?;
                     for c in indices.iter().skip(2) {
                         add_vertex_multi_index(

diff --git a/src/tests.rs b/src/tests.rs
@@ -7,9 +7,9 @@ use std::{
 
 use crate as tobj;
 
-const CORNELL_BOX_OBJ: &'static str = include_str!("../obj/cornell_box.obj");
-const CORNELL_BOX_MTL1: &'static str = include_str!("../obj/cornell_box.mtl");
-const CORNELL_BOX_MTL2: &'static str = include_str!("../obj/cornell_box2.mtl");
+const CORNELL_BOX_OBJ: &str = include_str!("../obj/cornell_box.obj");
+const CORNELL_BOX_MTL1: &str = include_str!("../obj/cornell_box.mtl");
+const CORNELL_BOX_MTL2: &str = include_str!("../obj/cornell_box2.mtl");
 
 // Set the tolerance for float comparison
 use crate::Float;
@@ -271,6 +271,7 @@ fn multiple_face_formats() {
     assert!(tri.texcoords.is_empty());
 }
 
+#[allow(clippy::excessive_precision)]
 fn validate_cornell(models: Vec<tobj::Model>, mats: Vec<tobj::Material>) {
     // Verify the floor loaded properly
     assert_eq!(models[0].name, "floor");