From 8b60656443073b9d043948333c606f6d09900e31 Mon Sep 17 00:00:00 2001
From: Jann-Niklas Zimmermann <jann-niklas.zimmermann@campus.tu-berlin.de>
Date: Mon, 14 Oct 2019 12:59:01 +0200
Subject: [PATCH] Add solutions for first excercises and test

---
 Cargo.lock                        | 2 +-
 exercises/functions/functions1.rs | 3 +--
 exercises/functions/functions2.rs | 2 +-
 exercises/functions/functions3.rs | 2 +-
 exercises/functions/functions4.rs | 2 +-
 exercises/functions/functions5.rs | 2 +-
 exercises/if/if1.rs               | 1 +
 exercises/test1.rs                | 8 ++++++++
 exercises/variables/variables1.rs | 2 +-
 exercises/variables/variables2.rs | 2 +-
 exercises/variables/variables3.rs | 2 +-
 exercises/variables/variables4.rs | 2 +-
 12 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36d066e..0a61ec7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -600,7 +600,7 @@ dependencies = [
 
 [[package]]
 name = "rustlings"
-version = "1.4.0"
+version = "1.4.1"
 dependencies = [
  "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 396dd56..f95bffb 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -5,8 +5,7 @@ fn main() {
     call_me();
 }
 
-
-
+fn call_me() {}
 
 
 
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 1cf95c3..0b7a2ae 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -5,7 +5,7 @@ fn main() {
     call_me(3);
 }
 
-fn call_me(num) {
+fn call_me(num: i32) {
     for i in 0..num {
         println!("Ring! Call number {}", i + 1);
     }
diff --git a/exercises/functions/functions3.rs b/exercises/functions/functions3.rs
index b17543b..1fb2886 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -2,7 +2,7 @@
 // Make me compile! Scroll down for hints :)
 
 fn main() {
-    call_me();
+    call_me(5);
 }
 
 fn call_me(num: i32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 5baca0e..cd34d12 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -9,7 +9,7 @@ fn main() {
     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 d9227c9..299ab2f 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -7,7 +7,7 @@ fn main() {
 }
 
 fn square(num: i32) -> i32 {
-    num * num;
+    num * num
 }
 
 
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 636e6ce..fdc7e3d 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -7,6 +7,7 @@ pub fn bigger(a: i32, b: i32) -> i32 {
     // - another function call
     // - additional variables
     // Scroll down for hints.
+    if a > b { a } else { b }
 }
 
 // Don't mind this for now :)
diff --git a/exercises/test1.rs b/exercises/test1.rs
index d57d495..9f49cc1 100644
--- a/exercises/test1.rs
+++ b/exercises/test1.rs
@@ -10,6 +10,14 @@
 // Put your function here!
 // fn ..... {
 
+fn calculate_price(amount: i32) -> i32 {
+    if amount > 40 {
+        amount * 1
+    } else {
+        amount * 2
+    }
+}
+
 // Don't modify this function!
 #[test]
 fn verify_test() {
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 1cdd270..708e852 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -2,7 +2,7 @@
 // Make me compile! Scroll down for hints :)
 
 fn main() {
-    x = 5;
+    let x = 5;
     println!("x has the value {}", x);
 }
 
diff --git a/exercises/variables/variables2.rs b/exercises/variables/variables2.rs
index a0b4a37..82df262 100644
--- a/exercises/variables/variables2.rs
+++ b/exercises/variables/variables2.rs
@@ -2,7 +2,7 @@
 // Make me compile! Scroll down for hints :)
 
 fn main() {
-    let x;
+    let x: i32 = 0;
     if x == 10 {
         println!("Ten!");
     } else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 165a277..9076615 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -2,7 +2,7 @@
 // Make me compile! Scroll down for hints :)
 
 fn main() {
-    let x = 3;
+    let mut x = 3;
     println!("Number {}", x);
     x = 5;
     println!("Number {}", x);
diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs
index 71ebf0f..a5ae769 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -2,7 +2,7 @@
 // Make me compile! Scroll down for hints :)
 
 fn main() {
-    let x: i32;
+    let x: i32 = 10;
     println!("Number {}", x);
 }