Skip to content

Commit 9ca3158

Browse files
committed
refactor: replace build_nexter function with NexterFactory::build for consistency
1 parent ce5d783 commit 9ca3158

2 files changed

Lines changed: 6 additions & 17 deletions

File tree

cli/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn perform_impl(
2222
}
2323

2424
fn perform_from_file(opts: CliOpts) -> Vec<Result<String>> {
25-
let nexter = sibling::build_nexter(opts.nexter);
25+
let nexter = sibling::NexterFactory::build(opts.nexter);
2626
let r = match opts.input {
2727
None => Err(SiblingError::Fatal("input is not specified".into())),
2828
Some(file) => match sibling::Dirs::new_from_file(file) {
@@ -46,7 +46,7 @@ fn perform_each(
4646
}
4747

4848
fn perform_sibling(opts: CliOpts) -> Vec<Result<String>> {
49-
let nexter = sibling::build_nexter(opts.nexter);
49+
let nexter = sibling::NexterFactory::build(opts.nexter);
5050
let target_dirs = if opts.dirs.is_empty() {
5151
vec![std::env::current_dir().unwrap()]
5252
} else {

lib/src/lib.rs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
262251
struct First {}
263252
struct Last {}
264253
struct 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

Comments
 (0)