From 41b285755dd659d15453bb3419243c8618a208f8 Mon Sep 17 00:00:00 2001
From: ozogxyz <50372354+ozogxyz@users.noreply.github.com>
Date: Sat, 11 Mar 2023 20:59:40 +0300
Subject: [PATCH] quiz 1 OK.

---
 Cargo.lock                        |  2 +-
 exercises/functions/functions1.rs |  4 ++--
 exercises/functions/functions2.rs |  4 +---
 exercises/functions/functions3.rs |  4 +---
 exercises/functions/functions4.rs |  4 +---
 exercises/functions/functions5.rs |  4 +---
 exercises/if/if1.rs               |  7 +++++--
 exercises/if/if2.rs               |  6 +++---
 exercises/quiz1.rs                | 10 +++++++---
 9 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d04953d..2c29925c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -459,7 +459,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "rustlings"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "argh",
  "assert_cmd",
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 03d8af70..bf24085e 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,8 +1,8 @@
 // functions1.rs
 // Execute `rustlings hint functions1` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 fn main() {
     call_me();
 }
+
+fn call_me() {}
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 7d40a578..91a1cc36 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,11 @@
 // functions2.rs
 // Execute `rustlings hint functions2` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 fn main() {
     call_me(3);
 }
 
-fn call_me(num:) {
+fn call_me(num: i8) {
     for i in 0..num {
         println!("Ring! Call number {}", i + 1);
     }
diff --git a/exercises/functions/functions3.rs b/exercises/functions/functions3.rs
index 3b9e585b..617a050a 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -1,10 +1,8 @@
 // functions3.rs
 // Execute `rustlings hint functions3` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 fn main() {
-    call_me();
+    call_me(10);
 }
 
 fn call_me(num: u32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 65d5be4f..40677fc9 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -7,14 +7,12 @@
 // in the signatures for now. If anything, this is a good way to peek ahead
 // to future exercises!)
 
-// I AM NOT DONE
-
 fn main() {
     let original_price = 51;
     println!("Your sale price is {}", sale_price(original_price));
 }
 
-fn sale_price(price: i32) -> {
+fn sale_price(price: i32) -> i32 {
     if is_even(price) {
         price - 10
     } else {
diff --git a/exercises/functions/functions5.rs b/exercises/functions/functions5.rs
index 5d762961..ee8210ab 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,13 +1,11 @@
 // functions5.rs
 // Execute `rustlings hint functions5` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 fn main() {
     let answer = square(3);
     println!("The square of 3 is {}", answer);
 }
 
 fn square(num: i32) -> i32 {
-    num * num;
+    num * num
 }
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 587e03f8..660a093c 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,13 +1,16 @@
 // if1.rs
 // Execute `rustlings hint if1` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 pub fn bigger(a: i32, b: i32) -> i32 {
     // Complete this function to return the bigger number!
     // Do not use:
     // - another function call
     // - additional variables
+    if a > b {
+        a
+    } else {
+        b
+    }
 }
 
 // Don't mind this for now :)
diff --git a/exercises/if/if2.rs b/exercises/if/if2.rs
index effddbb6..129a4a25 100644
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -4,13 +4,13 @@
 // Step 2: Get the bar_for_fuzz and default_to_baz tests passing!
 // Execute `rustlings hint if2` or use the `hint` watch subcommand for a hint.
 
-// I AM NOT DONE
-
 pub fn foo_if_fizz(fizzish: &str) -> &str {
     if fizzish == "fizz" {
         "foo"
+    } else if fizzish == "fuzz" {
+        "bar"
     } else {
-        1
+        "baz"
     }
 }
 
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index dbb5cdc9..8bf58dec 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -10,10 +10,14 @@
 // Write a function that calculates the price of an order of apples given
 // the quantity bought. No hints this time!
 
-// I AM NOT DONE
-
 // Put your function here!
-// fn calculate_price_of_apples {
+fn calculate_price_of_apples(apples_bought: u32) -> u32 {
+    if apples_bought > 40 {
+        apples_bought
+    } else {
+        2 * apples_bought
+    }
+}
 
 // Don't modify this function!
 #[test]