From 3a64cde5ff9930dbaed2e8f8a865127f84b68e3c Mon Sep 17 00:00:00 2001
From: Rakshit Sinha <rakshit.sinha@oracle.com>
Date: Mon, 5 Jul 2021 15:54:35 -0700
Subject: [PATCH] Added my solutions to variables, functions and quiz1
---
exercises/functions/functions1.rs | 4 ++--
exercises/functions/functions2.rs | 4 +---
exercises/functions/functions3.rs | 5 ++---
exercises/functions/functions4.rs | 4 +---
exercises/functions/functions5.rs | 4 +---
exercises/quiz1.rs | 8 +++++++-
exercises/variables/variables1.rs | 4 +---
exercises/variables/variables2.rs | 4 +---
exercises/variables/variables3.rs | 4 +---
exercises/variables/variables4.rs | 4 +---
exercises/variables/variables5.rs | 4 +---
exercises/variables/variables6.rs | 4 +---
12 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..d0867d7 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,8 +1,8 @@
// functions1.rs
// Make me compile! Execute `rustlings hint functions1` for hints :)
-// I AM NOT DONE
-
fn main() {
call_me();
}
+
+fn call_me() {}
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 5721a17..40b5140 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,11 @@
// functions2.rs
// Make me compile! Execute `rustlings hint functions2` for hints :)
-// 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 ed5f839..5674ba2 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -1,10 +1,9 @@
// functions3.rs
// Make me compile! Execute `rustlings hint functions3` for hints :)
-// I AM NOT DONE
-
fn main() {
- call_me();
+ let num: u32 = 3;
+ call_me(num);
}
fn call_me(num: u32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 58637e4..b6af7c4 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -4,14 +4,12 @@
// This store is having a sale where if the price is an even number, you get
// 10 Rustbucks off, but if it's an odd number, it's 3 Rustbucks off.
-// 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 d22aa6c..059e929 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,13 +1,11 @@
// functions5.rs
// Make me compile! Execute `rustlings hint functions5` for hints :)
-// I AM NOT DONE
-
fn main() {
let answer = square(3);
println!("The answer is {}", answer);
}
fn square(num: i32) -> i32 {
- num * num;
+ num * num
}
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..c703e34 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -10,7 +10,13 @@
// I AM NOT DONE
// Put your function here!
-// fn ..... {
+fn calculate_apple_price(quantity: i32) -> i32 {
+ if quantity < 40 {
+ quantity * 2
+ } else {
+ quantity
+ }
+}
// Don't modify this function!
#[test]
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 4a3af73..db85e7e 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -6,9 +6,7 @@
// even after you already figured it out. If you got everything working and
// feel ready for the next exercise, remove the `I AM NOT DONE` comment below.
-// I AM NOT DONE
-
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 7774a8f..6eecc5e 100644
--- a/exercises/variables/variables2.rs
+++ b/exercises/variables/variables2.rs
@@ -1,10 +1,8 @@
// variables2.rs
// Make me compile! Execute the command `rustlings hint variables2` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
- let x;
+ let x: i8 = 1;
if x == 10 {
println!("Ten!");
} else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 30ec48f..7d84709 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -1,10 +1,8 @@
// variables3.rs
// Make me compile! Execute the command `rustlings hint variables3` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
- let x = 3;
+ let mut x = 3;
println!("Number {}", x);
x = 5; // don't change this line
println!("Number {}", x);
diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs
index 77f1e9a..62fb1c2 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -1,9 +1,7 @@
// variables4.rs
// Make me compile! Execute the command `rustlings hint variables4` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
- let x: i32;
+ let x: i32 = 10;
println!("Number {}", x);
}
diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs
index da37ae9..10ef314 100644
--- a/exercises/variables/variables5.rs
+++ b/exercises/variables/variables5.rs
@@ -1,11 +1,9 @@
// variables5.rs
// Make me compile! Execute the command `rustlings hint variables5` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
let number = "T-H-R-E-E";
println!("Spell a Number : {}", number);
- number = 3;
+ let number = 3;
println!("Number plus two is : {}", number + 2);
}
diff --git a/exercises/variables/variables6.rs b/exercises/variables/variables6.rs
index 9866691..ca4d447 100644
--- a/exercises/variables/variables6.rs
+++ b/exercises/variables/variables6.rs
@@ -1,9 +1,7 @@
// variables6.rs
// Make me compile! Execute the command `rustlings hint variables6` if you want a hint :)
-// I AM NOT DONE
-
-const NUMBER = 3;
+const NUMBER: i8 = 3;
fn main() {
println!("Number {}", NUMBER);
}