From f88b2601d4b1f1d70b1dd2eba83b7bc62acb27b0 Mon Sep 17 00:00:00 2001 From: perro Date: Mon, 13 Feb 2023 16:57:21 -0800 Subject: [PATCH] Algo de formato --- exercises/ex01/src/bin/false.rs | 2 +- exercises/ex01/src/bin/true.rs | 2 +- exercises/ex01/tests/cli.rs | 12 ++++++------ exercises/ex02/src/main.rs | 6 +++++- exercises/ex02/tests/cli.rs | 8 ++++++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/exercises/ex01/src/bin/false.rs b/exercises/ex01/src/bin/false.rs index 36a129b..2dfc201 100644 --- a/exercises/ex01/src/bin/false.rs +++ b/exercises/ex01/src/bin/false.rs @@ -1,3 +1,3 @@ fn main() { - std::process::abort(); + std::process::abort(); } diff --git a/exercises/ex01/src/bin/true.rs b/exercises/ex01/src/bin/true.rs index 5b3e6ee..44490fa 100644 --- a/exercises/ex01/src/bin/true.rs +++ b/exercises/ex01/src/bin/true.rs @@ -1,3 +1,3 @@ fn main() { - std::process::exit(0); + std::process::exit(0); } diff --git a/exercises/ex01/tests/cli.rs b/exercises/ex01/tests/cli.rs index 805a7cc..a69010f 100644 --- a/exercises/ex01/tests/cli.rs +++ b/exercises/ex01/tests/cli.rs @@ -2,18 +2,18 @@ use assert_cmd::Command; #[test] fn runs() { - let mut cmd = Command::cargo_bin("hello").unwrap(); - cmd.assert().success().stdout("Hello, world!\n"); + let mut cmd = Command::cargo_bin("hello").unwrap(); + cmd.assert().success().stdout("Hello, world!\n"); } #[test] fn true_ok() { - let mut cmd = Command::cargo_bin("true").unwrap(); - cmd.assert().success(); + let mut cmd = Command::cargo_bin("true").unwrap(); + cmd.assert().success(); } #[test] fn false_not_ok() { - let mut cmd = Command::cargo_bin("false").unwrap(); - cmd.assert().failure(); + let mut cmd = Command::cargo_bin("false").unwrap(); + cmd.assert().failure(); } diff --git a/exercises/ex02/src/main.rs b/exercises/ex02/src/main.rs index 95efc74..7bfa847 100644 --- a/exercises/ex02/src/main.rs +++ b/exercises/ex02/src/main.rs @@ -21,6 +21,10 @@ fn main() { .get_matches(); // OJO: unwrap es seguro de llamar porque 'text' está forzado en tener al menos un valor let text = matches.values_of_lossy("text").unwrap(); - let ending = if matches.is_present("omit_newline") { "" } else { "\n"}; + let ending = if matches.is_present("omit_newline") { + "" + } else { + "\n" + }; print!("{}{}", text.join(" "), ending); } diff --git a/exercises/ex02/tests/cli.rs b/exercises/ex02/tests/cli.rs index 6985392..bc72d8e 100644 --- a/exercises/ex02/tests/cli.rs +++ b/exercises/ex02/tests/cli.rs @@ -1,12 +1,16 @@ -use std::fs; use assert_cmd::Command; use predicates::prelude::*; +use std::fs; type TestResult = Result<(), Box>; fn run(args: &[&str], expected_file: &str) -> TestResult { let expected = fs::read_to_string(format!("{}{}", "tests/expected/", expected_file))?; - Command::cargo_bin("echor")?.args(args).assert().success().stdout(expected); + Command::cargo_bin("echor")? + .args(args) + .assert() + .success() + .stdout(expected); Ok(()) }