x/rustlings
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(main): Let find_exercise work with borrows

Browse Source
This commit is contained in:
mokou 2021-04-21 16:21:56 +02:00
parent 6177b6e126
commit 347f30bd86
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -201,13 +201,13 @@ fn main() {
} }
Subcommands::Run(subargs) => { Subcommands::Run(subargs) => {
let exercise = find_exercise(subargs.name, exercises); let exercise = find_exercise(&subargs.name, &exercises);
run(&exercise, verbose).unwrap_or_else(|_| std::process::exit(1)); run(&exercise, verbose).unwrap_or_else(|_| std::process::exit(1));
} }
Subcommands::Hint(subargs) => { Subcommands::Hint(subargs) => {
let exercise = find_exercise(subargs.name, exercises); let exercise = find_exercise(&subargs.name, &exercises);
println!("{}", exercise.hint); println!("{}", exercise.hint);
} }
@ -285,14 +285,12 @@ fn spawn_watch_shell(failed_exercise_hint: &Arc<Mutex<Option<String>>>) {
}); });
} }
fn find_exercise(name: String, exercises: Vec<Exercise>) -> Exercise { fn find_exercise<'a>(name: &str, exercises: &'a [Exercise]) -> &'a Exercise {
let matching_exercise = |e: &Exercise| name == e.name;
exercises exercises
.into_iter() .iter()
.find(matching_exercise) .find(|e| e.name == name)
.unwrap_or_else(|| { .unwrap_or_else(|| {
println!("No exercise found for your given name!"); println!("No exercise found for '{}'!", name);
std::process::exit(1) std::process::exit(1)
}) })
} }