mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-26 00:00:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2110 from senekor/remo/skkynvtqxkoz

Browse source 
Make if2 less confusing
This commit is contained in:
Mo 2024-09-16 12:54:20 +02:00 committed by GitHub
parent 1bae2dcb00 b540c6df25
commit 2894f3c45c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
exercises/03_if/if2.rs
View file

@ -1,7 +1,7 @@
// TODO: Fix the compiler error on this function. // TODO: Fix the compiler error on this function.
fn foo_if_fizz(fizzish: &str) -> &str { fn picky_eater(food: &str) -> &str {
if fizzish == "fizz" { if food == "strawberry" {
"foo" "Yummy!"
} else { } else {
1 1
} }
@ -18,18 +18,20 @@ mod tests {
use super::*; use super::*;
#[test] #[test]
fn foo_for_fizz() { fn yummy_food() {
// This means that calling `foo_if_fizz` with the argument "fizz" should return "foo". // This means that calling `picky_eater` with the argument "food" should return "Yummy!".
assert_eq!(foo_if_fizz("fizz"), "foo"); assert_eq!(picky_eater("strawberry"), "Yummy!");
} }
#[test] #[test]
fn bar_for_fuzz() { fn neutral_food() {
assert_eq!(foo_if_fizz("fuzz"), "bar"); assert_eq!(picky_eater("potato"), "I guess I can eat that.");
} }
#[test] #[test]
fn default_to_baz() { fn default_disliked_food() {
assert_eq!(foo_if_fizz("literally anything"), "baz"); assert_eq!(picky_eater("broccoli"), "No thanks!");
assert_eq!(picky_eater("gummy bears"), "No thanks!");
assert_eq!(picky_eater("literally anything"), "No thanks!");
} }
} }

26
solutions/03_if/if2.rs
View file

@ -1,10 +1,10 @@
fn foo_if_fizz(fizzish: &str) -> &str { fn picky_eater(food: &str) -> &str {
if fizzish == "fizz" { if food == "strawberry" {
"foo" "Yummy!"
} else if fizzish == "fuzz" { } else if food == "potato" {
"bar" "I guess I can eat that."
} else { } else {
"baz" "No thanks!"
} }
} }
@ -17,17 +17,19 @@ mod tests {
use super::*; use super::*;
#[test] #[test]
fn foo_for_fizz() { fn yummy_food() {
assert_eq!(foo_if_fizz("fizz"), "foo"); assert_eq!(picky_eater("strawberry"), "Yummy!");
} }
#[test] #[test]
fn bar_for_fuzz() { fn neutral_food() {
assert_eq!(foo_if_fizz("fuzz"), "bar"); assert_eq!(picky_eater("potato"), "I guess I can eat that.");
} }
#[test] #[test]
fn default_to_baz() { fn default_disliked_food() {
assert_eq!(foo_if_fizz("literally anything"), "baz"); assert_eq!(picky_eater("broccoli"), "No thanks!");
assert_eq!(picky_eater("gummy bears"), "No thanks!");
assert_eq!(picky_eater("literally anything"), "No thanks!");
} }
} }