mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-25 23:10:30 +00:00
feature: makes "compile" exercise print output, resolves #270
When running "compile"-mode exercises in interactive `verify` mode, we print their output when we prompt the learner if they want to continue. This improves the "experimentation" experience, since trying different things does produce a visible change.
This commit is contained in:
parent
7ce42941ea
commit
3b6d5c3aaa
3 changed files with 67 additions and 36 deletions
|
@ -8,7 +8,4 @@
|
||||||
fn slice_out_of_array() {
|
fn slice_out_of_array() {
|
||||||
let a = [1, 2, 3, 4, 5];
|
let a = [1, 2, 3, 4, 5];
|
||||||
|
|
||||||
let nice_slice = ???
|
|
||||||
|
|
||||||
assert_eq!([2, 3, 4], nice_slice)
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use crate::exercise::{Exercise, Mode, State};
|
use crate::exercise::{CompiledExercise, Exercise, Mode, State};
|
||||||
use console::style;
|
use console::style;
|
||||||
use indicatif::ProgressBar;
|
use indicatif::ProgressBar;
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ pub fn verify<'a>(start_at: impl IntoIterator<Item = &'a Exercise>) -> Result<()
|
||||||
for exercise in start_at {
|
for exercise in start_at {
|
||||||
let compile_result = match exercise.mode {
|
let compile_result = match exercise.mode {
|
||||||
Mode::Test => compile_and_test(&exercise, RunMode::Interactive),
|
Mode::Test => compile_and_test(&exercise, RunMode::Interactive),
|
||||||
Mode::Compile => compile_only(&exercise),
|
Mode::Compile => compile_and_run_interactively(&exercise),
|
||||||
Mode::Clippy => compile_only(&exercise),
|
Mode::Clippy => compile_only(&exercise),
|
||||||
};
|
};
|
||||||
if !compile_result.unwrap_or(false) {
|
if !compile_result.unwrap_or(false) {
|
||||||
|
@ -30,23 +30,37 @@ fn compile_only(exercise: &Exercise) -> Result<bool, ()> {
|
||||||
let progress_bar = ProgressBar::new_spinner();
|
let progress_bar = ProgressBar::new_spinner();
|
||||||
progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
|
progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
|
||||||
progress_bar.enable_steady_tick(100);
|
progress_bar.enable_steady_tick(100);
|
||||||
let compilation_result = exercise.compile();
|
|
||||||
|
let _ = compile(&exercise, &progress_bar)?;
|
||||||
progress_bar.finish_and_clear();
|
progress_bar.finish_and_clear();
|
||||||
|
|
||||||
match compilation_result {
|
success!("Successfully compiled {}!", exercise);
|
||||||
Ok(_) => {
|
Ok(prompt_for_completion(&exercise, None))
|
||||||
success!("Successfully compiled {}!", exercise);
|
}
|
||||||
Ok(prompt_for_completion(&exercise))
|
|
||||||
}
|
fn compile_and_run_interactively(exercise: &Exercise) -> Result<bool, ()> {
|
||||||
|
let progress_bar = ProgressBar::new_spinner();
|
||||||
|
progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
|
||||||
|
progress_bar.enable_steady_tick(100);
|
||||||
|
|
||||||
|
let compilation = compile(&exercise, &progress_bar)?;
|
||||||
|
|
||||||
|
progress_bar.set_message(format!("Running {}...", exercise).as_str());
|
||||||
|
let result = compilation.run();
|
||||||
|
progress_bar.finish_and_clear();
|
||||||
|
|
||||||
|
let output = match result {
|
||||||
|
Ok(output) => output,
|
||||||
Err(output) => {
|
Err(output) => {
|
||||||
warn!(
|
warn!("Ran {} with errors", exercise);
|
||||||
"Compilation of {} failed! Compiler error message:\n",
|
println!("{}", output.stdout);
|
||||||
exercise
|
return Err(());
|
||||||
);
|
|
||||||
println!("{}", output.stderr);
|
|
||||||
Err(())
|
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
|
success!("Successfully ran {}!", exercise);
|
||||||
|
|
||||||
|
Ok(prompt_for_completion(&exercise, Some(output.stdout)))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()> {
|
fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()> {
|
||||||
|
@ -54,28 +68,15 @@ fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()>
|
||||||
progress_bar.set_message(format!("Testing {}...", exercise).as_str());
|
progress_bar.set_message(format!("Testing {}...", exercise).as_str());
|
||||||
progress_bar.enable_steady_tick(100);
|
progress_bar.enable_steady_tick(100);
|
||||||
|
|
||||||
let compilation_result = exercise.compile();
|
let compilation = compile(exercise, &progress_bar)?;
|
||||||
|
|
||||||
let compilation = match compilation_result {
|
|
||||||
Ok(compilation) => compilation,
|
|
||||||
Err(output) => {
|
|
||||||
progress_bar.finish_and_clear();
|
|
||||||
warn!(
|
|
||||||
"Compiling of {} failed! Please try again. Here's the output:",
|
|
||||||
exercise
|
|
||||||
);
|
|
||||||
println!("{}", output.stderr);
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let result = compilation.run();
|
let result = compilation.run();
|
||||||
progress_bar.finish_and_clear();
|
progress_bar.finish_and_clear();
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
|
success!("Successfully tested {}", &exercise);
|
||||||
if let RunMode::Interactive = run_mode {
|
if let RunMode::Interactive = run_mode {
|
||||||
Ok(prompt_for_completion(&exercise))
|
Ok(prompt_for_completion(&exercise, None))
|
||||||
} else {
|
} else {
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
@ -91,7 +92,27 @@ fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn prompt_for_completion(exercise: &Exercise) -> bool {
|
fn compile<'a, 'b>(
|
||||||
|
exercise: &'a Exercise,
|
||||||
|
progress_bar: &'b ProgressBar,
|
||||||
|
) -> Result<CompiledExercise<'a>, ()> {
|
||||||
|
let compilation_result = exercise.compile();
|
||||||
|
|
||||||
|
match compilation_result {
|
||||||
|
Ok(compilation) => Ok(compilation),
|
||||||
|
Err(output) => {
|
||||||
|
progress_bar.finish_and_clear();
|
||||||
|
warn!(
|
||||||
|
"Compiling of {} failed! Please try again. Here's the output:",
|
||||||
|
exercise
|
||||||
|
);
|
||||||
|
println!("{}", output.stderr);
|
||||||
|
Err(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn prompt_for_completion(exercise: &Exercise, prompt_output: Option<String>) -> bool {
|
||||||
let context = match exercise.state() {
|
let context = match exercise.state() {
|
||||||
State::Done => return true,
|
State::Done => return true,
|
||||||
State::Pending(context) => context,
|
State::Pending(context) => context,
|
||||||
|
@ -106,6 +127,15 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {
|
||||||
println!("");
|
println!("");
|
||||||
println!("🎉 🎉 {} 🎉 🎉", success_msg);
|
println!("🎉 🎉 {} 🎉 🎉", success_msg);
|
||||||
println!("");
|
println!("");
|
||||||
|
|
||||||
|
if let Some(output) = prompt_output {
|
||||||
|
println!("Output:");
|
||||||
|
println!("{}", separator());
|
||||||
|
println!("{}", output);
|
||||||
|
println!("{}", separator());
|
||||||
|
println!("");
|
||||||
|
}
|
||||||
|
|
||||||
println!("You can keep working on this exercise,");
|
println!("You can keep working on this exercise,");
|
||||||
println!(
|
println!(
|
||||||
"or jump into the next one by removing the {} comment:",
|
"or jump into the next one by removing the {} comment:",
|
||||||
|
@ -129,3 +159,7 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {
|
||||||
|
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn separator() -> console::StyledObject<&'static str> {
|
||||||
|
style("====================").bold()
|
||||||
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@ fn verify_all_success() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn verify_all_failure() {
|
fn verify_fails_if_some_fails() {
|
||||||
Command::cargo_bin("rustlings")
|
Command::cargo_bin("rustlings")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.arg("v")
|
.arg("v")
|
||||||
|
|
Loading…
Reference in a new issue