red/rustlings
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unwrap on canonicalize result

Browse source
This commit is contained in:
Chris Pearce 2019-04-12 22:24:13 +01:00
parent d01a71f7de
commit 8c867a001a
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main.rs
View file

@ -67,14 +67,17 @@ fn main() {
std::process::exit(1); std::process::exit(1);
}); });
let filepath = Path::new(filename).canonicalize().unwrap(); let matching_exercise = |e: &&Exercise| {
let exercise = exercises Path::new(filename)
.iter() .canonicalize()
.find(|e| filepath.ends_with(&e.path)) .map(|p| p.ends_with(&e.path))
.unwrap_or_else(|| { .unwrap_or(false)
println!("No exercise found for your file name!"); };
std::process::exit(1)
}); let exercise = exercises.iter().find(matching_exercise).unwrap_or_else(|| {
println!("No exercise found for your file name!");
std::process::exit(1)
});
run(&exercise).unwrap_or_else(|_| std::process::exit(1)); run(&exercise).unwrap_or_else(|_| std::process::exit(1));
} }