Archives/rustlings
2
0
Fork 0
mirror of https://github.com/rust-lang/rustlings synced 2024-11-05 00:00:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #493 from etiennebarrie/cargo-fmt

Browse Source 
chore: Run cargo fmt
This commit is contained in:
fmoko 2020-08-10 17:33:22 +02:00 committed by GitHub
commit d1054cd596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/exercise.rs
View File

@ -167,9 +167,10 @@ path = "{}.rs""#,
fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> { fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
let arg = match self.mode { let arg = match self.mode {
Mode::Test => "--show-output", Mode::Test => "--show-output",
_ => "" _ => "",
}; };
let cmd = Command::new(&temp_file()).arg(arg) let cmd = Command::new(&temp_file())
.arg(arg)
.output() .output()
.expect("Failed to run 'run' command"); .expect("Failed to run 'run' command");

4
src/main.rs
View File

@ -126,9 +126,7 @@ fn main() {
); );
println!(); println!();
println!("We hope you enjoyed learning about the various aspects of Rust!"); println!("We hope you enjoyed learning about the various aspects of Rust!");
println!( println!("If you noticed any issues, please don't hesitate to report them to our repo.");
"If you noticed any issues, please don't hesitate to report them to our repo."
);
println!("You can also contribute your own exercises to help the greater community!"); println!("You can also contribute your own exercises to help the greater community!");
println!(); println!();
println!("Before reporting an issue or contributing, please read our guidelines:"); println!("Before reporting an issue or contributing, please read our guidelines:");

6
src/verify.rs
View File

@ -9,7 +9,7 @@ use indicatif::ProgressBar;
// determines whether or not the test harness outputs are displayed. // determines whether or not the test harness outputs are displayed.
pub fn verify<'a>( pub fn verify<'a>(
start_at: impl IntoIterator<Item = &'a Exercise>, start_at: impl IntoIterator<Item = &'a Exercise>,
verbose: bool verbose: bool,
) -> Result<(), &'a Exercise> { ) -> Result<(), &'a Exercise> {
for exercise in start_at { for exercise in start_at {
let compile_result = match exercise.mode { let compile_result = match exercise.mode {
@ -77,9 +77,7 @@ fn compile_and_run_interactively(exercise: &Exercise) -> Result<bool, ()> {
// Compile the given Exercise as a test harness and display // Compile the given Exercise as a test harness and display
// the output if verbose is set to true // the output if verbose is set to true
fn compile_and_test( fn compile_and_test(exercise: &Exercise, run_mode: RunMode, verbose: bool) -> Result<bool, ()> {
exercise: &Exercise, run_mode: RunMode, verbose: bool
) -> Result<bool, ()> {
let progress_bar = ProgressBar::new_spinner(); let progress_bar = ProgressBar::new_spinner();
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);