3737//extern crate byteorder;
3838
3939use byteorder:: { LittleEndian , ReadBytesExt , WriteBytesExt } ;
40- use float_cmp:: { ApproxEq , F32Margin } ;
40+ use float_cmp:: ApproxEq ;
41+ use std:: collections:: HashMap ;
4142use std:: io:: { BufRead , BufReader , BufWriter } ;
4243use std:: io:: { Read , Result , Write } ;
4344use std:: iter:: Iterator ;
44- use std:: collections:: HashMap ;
4545
4646/// Float Vector with approx_eq.
4747#[ derive( Default , Clone , Copy , Debug , PartialEq , PartialOrd ) ]
@@ -134,10 +134,7 @@ impl IndexedMesh {
134134 if area < f32:: EPSILON {
135135 return Err ( :: std:: io:: Error :: new (
136136 :: std:: io:: ErrorKind :: InvalidData ,
137- format ! (
138- "face #{} has a zero-area face" ,
139- fi
140- ) ,
137+ format ! ( "face #{} has a zero-area face" , fi) ,
141138 ) ) ;
142139 }
143140 }
@@ -159,9 +156,7 @@ impl IndexedMesh {
159156 :: std:: io:: ErrorKind :: InvalidData ,
160157 format ! (
161158 "did not find facing edge for face #{}, edge #v{} -> #v{}" ,
162- fi,
163- i1,
164- i2
159+ fi, i1, i2
165160 ) ,
166161 ) )
167162 } else {
@@ -260,7 +255,7 @@ where
260255
261256/// Struct for binary STL reader.
262257pub struct BinaryStlReader < ' a > {
263- reader : Box < dyn :: std:: io:: Read + ' a > ,
258+ reader : Box < dyn :: std:: io:: Read + ' a > ,
264259 index : usize ,
265260 size : usize ,
266261}
@@ -367,7 +362,7 @@ pub trait TriangleIterator: ::std::iter::Iterator<Item = Result<Triangle>> {
367362
368363/// Struct for ascii STL reader.
369364pub struct AsciiStlReader < ' a > {
370- lines : Box < dyn :: std:: iter:: Iterator < Item = Result < Vec < String > > > + ' a > ,
365+ lines : Box < dyn :: std:: iter:: Iterator < Item = Result < Vec < String > > > + ' a > ,
371366}
372367
373368impl < ' a > TriangleIterator for BinaryStlReader < ' a > { }
@@ -543,6 +538,8 @@ fn tri_area(a: Vertex, b: Vertex, c: Vertex) -> f32 {
543538#[ cfg( test) ]
544539mod test {
545540 use super :: * ;
541+ use float_cmp:: F32Margin ;
542+
546543 const BUNNY_99 : & [ u8 ] = include_bytes ! ( "testdata/bunny_99.stl" ) ;
547544 const BUNNY_99_ASCII : & [ u8 ] = include_bytes ! ( "testdata/bunny_99_ascii.stl" ) ;
548545
@@ -813,8 +810,8 @@ mod test {
813810
814811 #[ test]
815812 fn simple_tri_area ( ) {
816- let a = Vector :: new ( [ -1.0 , 1.0 , 0.0 ] ) ;
817- let b = Vector :: new ( [ 1.0 , -1.0 , 0.0 ] ) ;
813+ let a = Vector :: new ( [ -1.0 , 1.0 , 0.0 ] ) ;
814+ let b = Vector :: new ( [ 1.0 , -1.0 , 0.0 ] ) ;
818815 let c = Vector :: new ( [ -1.0 , -1.0 , 0.0 ] ) ;
819816 let area = tri_area ( a, b, c) ;
820817 assert_eq ! ( area, 2.0 ) ;
0 commit comments