@@ -248,17 +248,6 @@ impl NexterFactory {
248248 }
249249}
250250
251- pub fn build_nexter ( nexter_type : NexterType ) -> Box < dyn Nexter > {
252- match nexter_type {
253- NexterType :: First => Box :: new ( First { } ) ,
254- NexterType :: Last => Box :: new ( Last { } ) ,
255- NexterType :: Previous => Box :: new ( Previous { } ) ,
256- NexterType :: Next => Box :: new ( Next { } ) ,
257- NexterType :: Random => Box :: new ( Random { } ) ,
258- NexterType :: Keep => Box :: new ( Keep { } ) ,
259- }
260- }
261-
262251struct First { }
263252struct Last { }
264253struct Previous { }
@@ -356,7 +345,7 @@ mod tests {
356345 #[ test]
357346 fn test_nexter_first ( ) {
358347 let dirs = Dirs :: new ( "../testdata/c" ) . unwrap ( ) ;
359- let nexter = build_nexter ( NexterType :: First ) ;
348+ let nexter = NexterFactory :: build ( NexterType :: First ) ;
360349 match nexter. next ( & dirs, 1 ) {
361350 Some ( p) => assert ! ( p. path( ) . ends_with( "testdata/a" ) ) ,
362351 None => panic ! ( "unexpected None" ) ,
@@ -366,7 +355,7 @@ mod tests {
366355 #[ test]
367356 fn test_nexter_last ( ) {
368357 let dirs = Dirs :: new ( "../testdata/k" ) . unwrap ( ) ;
369- let nexter = build_nexter ( NexterType :: Last ) ;
358+ let nexter = NexterFactory :: build ( NexterType :: Last ) ;
370359 match nexter. next ( & dirs, 1 ) {
371360 Some ( p) => assert ! ( p. path( ) . ends_with( "testdata/z" ) ) ,
372361 None => panic ! ( "unexpected None" ) ,
@@ -376,7 +365,7 @@ mod tests {
376365 #[ test]
377366 fn test_nexter_next ( ) {
378367 let dirs = Dirs :: new ( "../testdata/c" ) . unwrap ( ) ;
379- let nexter = build_nexter ( NexterType :: Next ) ;
368+ let nexter = NexterFactory :: build ( NexterType :: Next ) ;
380369 match nexter. next ( & dirs, 1 ) {
381370 Some ( p) => assert ! ( p. path( ) . ends_with( "testdata/d" ) ) ,
382371 None => panic ! ( "unexpected None" ) ,
@@ -398,7 +387,7 @@ mod tests {
398387 #[ test]
399388 fn test_nexter_prev ( ) {
400389 let dirs = Dirs :: new ( "../testdata/k" ) . unwrap ( ) ;
401- let nexter = build_nexter ( NexterType :: Previous ) ;
390+ let nexter = NexterFactory :: build ( NexterType :: Previous ) ;
402391 match nexter. next ( & dirs, 1 ) {
403392 Some ( p) => assert ! ( p. path( ) . ends_with( "testdata/j" ) ) ,
404393 None => panic ! ( "unexpected None" ) ,
0 commit comments