From aac40f6120e704208518104279e6640623114c6d Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 17:53:24 +0900
Subject: [PATCH 1/9] fixes variables1
---
variables/variables1.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/variables/variables1.rs b/variables/variables1.rs
index e0ad5de..4be88a3 100644
--- a/variables/variables1.rs
+++ b/variables/variables1.rs
@@ -1,7 +1,7 @@
// Make me compile! Scroll down for hints :)
fn main() {
- x = 5;
+ let x = 5;
println!("x has the value {}", x);
}
From c01be98e3470fa199658422900abf92cd4a86828 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 17:54:13 +0900
Subject: [PATCH 2/9] fixes variables2
---
variables/variables2.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/variables/variables2.rs b/variables/variables2.rs
index ca02438..b592da3 100644
--- a/variables/variables2.rs
+++ b/variables/variables2.rs
@@ -1,7 +1,7 @@
// Make me compile! Scroll down for hints :)
fn main() {
- let x;
+ let x = 10;
if x == 10 {
println!("Ten!");
} else {
From 8aab9d9c035bb49d18a03061567aa884eca16970 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 17:58:15 +0900
Subject: [PATCH 3/9] fixes variables3
---
variables/variables3.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/variables/variables3.rs b/variables/variables3.rs
index ec55a95..0be8cb8 100644
--- a/variables/variables3.rs
+++ b/variables/variables3.rs
@@ -1,7 +1,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);
From d9b254276940b9c5d37dad2ee23026ac2ec2c7b8 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 17:58:49 +0900
Subject: [PATCH 4/9] fixes variables4
---
variables/variables4.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/variables/variables4.rs b/variables/variables4.rs
index 3f7f937..6334c78 100644
--- a/variables/variables4.rs
+++ b/variables/variables4.rs
@@ -1,7 +1,7 @@
// Make me compile! Scroll down for hints :)
fn main() {
- let x: i32;
+ let x: i32 = 777;
println!("Number {}", x);
}
From ccc9f924bdc619b1d1a1a1b021c5ceecf983f128 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 18:04:02 +0900
Subject: [PATCH 5/9] fixes functions1
---
functions/functions1.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/functions/functions1.rs b/functions/functions1.rs
index 3004363..77973c6 100644
--- a/functions/functions1.rs
+++ b/functions/functions1.rs
@@ -4,7 +4,9 @@ fn main() {
call_me();
}
-
+fn call_me() {
+ println!("thank you for calling me :)");
+}
From b000a64f033dde09264d1797f3ebfb9f21304fa4 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 18:04:47 +0900
Subject: [PATCH 6/9] fixes functions2
---
functions/functions2.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/functions2.rs b/functions/functions2.rs
index 97ed8f1..4471ccd 100644
--- a/functions/functions2.rs
+++ b/functions/functions2.rs
@@ -4,7 +4,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);
}
From d928df09427243f8ced0be19a6027bcbc13dd979 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 18:05:22 +0900
Subject: [PATCH 7/9] fixes functions3
---
functions/functions3.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/functions3.rs b/functions/functions3.rs
index 3dba67c..686c975 100644
--- a/functions/functions3.rs
+++ b/functions/functions3.rs
@@ -1,7 +1,7 @@
// Make me compile! Scroll down for hints :)
fn main() {
- call_me();
+ call_me(5);
}
fn call_me(num: i32) {
From f5708d39ae042143b41cf54d8a764e0f8af49d08 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 18:06:23 +0900
Subject: [PATCH 8/9] fixes functions4
---
functions/functions4.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/functions4.rs b/functions/functions4.rs
index e514b84..4b0d923 100644
--- a/functions/functions4.rs
+++ b/functions/functions4.rs
@@ -8,7 +8,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 {
From 88086d6b9ce2ac47e5e73a4d698c3f7b757c6c56 Mon Sep 17 00:00:00 2001
From: Sho Nakatani <lay.sakura@gmail.com>
Date: Fri, 30 Dec 2016 18:07:22 +0900
Subject: [PATCH 9/9] fixes functions5
---
functions/functions5.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/functions5.rs b/functions/functions5.rs
index a8d7cef..78f8ebb 100644
--- a/functions/functions5.rs
+++ b/functions/functions5.rs
@@ -6,7 +6,7 @@ fn main() {
}
fn square(num: i32) -> i32 {
- num * num;
+ num * num
}