mirror/ rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-06-05 09:06:08 +02:00
Code Issues

Implement From<ExerciseInfo> for Exercise

This commit is contained in:
mo8it 2024-04-30 01:39:31 +02:00
parent b6f40f2ec8
commit fef66b80ad
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/app_state.rs
View File

@ -121,34 +121,9 @@ impl AppState {
)?
.target_directory;
// Build exercises from their metadata in the info file.
let exercises = exercise_infos
.into_iter()
.map(|mut exercise_info| {
// Leaking to be able to borrow in the watch mode `Table`.
// Leaking is not a problem because the `AppState` instance lives until
// the end of the program.
let path = exercise_info.path().leak();
exercise_info.name.shrink_to_fit();
let name = exercise_info.name.leak();
let dir = exercise_info.dir.map(|mut dir| {
dir.shrink_to_fit();
&*dir.leak()
});
let hint = exercise_info.hint.trim().to_owned();
Exercise {
dir,
name,
path,
test: exercise_info.test,
strict_clippy: exercise_info.strict_clippy,
hint,
done: false,
}
})
.map(Exercise::from)
.collect::<Vec<_>>();
let mut slf = Self {

29
src/exercise.rs
View File

@ -10,6 +10,7 @@ use std::{
use crate::{
cmd::{run_cmd, CargoCmd},
in_official_repo,
info_file::ExerciseInfo,
terminal_link::TerminalFileLink,
DEBUG_PROFILE,
};
@ -132,6 +133,34 @@ impl Exercise {
}
}
impl From<ExerciseInfo> for Exercise {
fn from(mut exercise_info: ExerciseInfo) -> Self {
// Leaking to be able to borrow in the watch mode `Table`.
// Leaking is not a problem because the `AppState` instance lives until
// the end of the program.
let path = exercise_info.path().leak();
exercise_info.name.shrink_to_fit();
let name = exercise_info.name.leak();
let dir = exercise_info.dir.map(|mut dir| {
dir.shrink_to_fit();
&*dir.leak()
});
let hint = exercise_info.hint.trim().to_owned();
Exercise {
dir,
name,
path,
test: exercise_info.test,
strict_clippy: exercise_info.strict_clippy,
hint,
done: false,
}
}
}
impl Display for Exercise {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
self.path.fmt(f)