From 118e20423647453a21bef163345dcff8416b5d6e Mon Sep 17 00:00:00 2001
From: Eri Mendz <erimendz@gmail.com>
Date: Mon, 17 May 2021 09:29:44 +0300
Subject: [PATCH] add answer commits completed so far
---
exercises/functions/functions1.rs | 5 ++++-
exercises/functions/functions2.rs | 6 +++---
exercises/functions/functions3.rs | 3 +--
exercises/functions/functions4.rs | 5 ++---
exercises/functions/functions5.rs | 3 +--
exercises/if/if1.rs | 7 ++++++-
exercises/if/if2.rs | 8 +++++---
exercises/move_semantics/move_semantics1.rs | 5 +++--
exercises/quiz1.rs | 10 +++++++++-
exercises/quiz2.rs | 20 ++++++++++----------
10 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..5e1e5f1 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,8 +1,11 @@
// functions1.rs
// Make me compile! Execute `rustlings hint functions1` for hints :)
-// I AM NOT DONE
fn main() {
call_me();
}
+
+fn call_me() {
+ println!("heres my number 0558974478, call me");
+}
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 5721a17..4d90513 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,13 @@
// functions2.rs
// Make me compile! Execute `rustlings hint functions2` for hints :)
-// I AM NOT DONE
fn main() {
- call_me(3);
+ let num = 3;
+ call_me(num);
}
-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 e3c1bf7..f08dae5 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();
+ call_me(8);
}
fn call_me(num: i32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 58637e4..de720a3 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -4,14 +4,13 @@
// 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;
+ let original_price = 502;
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..bec15d5 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,7 +1,6 @@
// functions5.rs
// Make me compile! Execute `rustlings hint functions5` for hints :)
-// I AM NOT DONE
fn main() {
let answer = square(3);
@@ -9,5 +8,5 @@ fn main() {
}
fn square(num: i32) -> i32 {
- num * num;
+ num * num //remove the semicolon to complile
}
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 9086754..983c466 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,6 +1,5 @@
// if1.rs
-// I AM NOT DONE
pub fn bigger(a: i32, b: i32) -> i32 {
// Complete this function to return the bigger number!
@@ -8,8 +7,14 @@ pub fn bigger(a: i32, b: i32) -> i32 {
// - another function call
// - additional variables
// Execute `rustlings hint if1` for hints
+ if a > b {
+ a
+ } else {
+ b
+ }
}
+
// Don't mind this for now :)
#[cfg(test)]
mod tests {
diff --git a/exercises/if/if2.rs b/exercises/if/if2.rs
index 80effbd..ac8fff7 100644
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -4,14 +4,16 @@
// Step 2: Get the bar_for_fuzz and default_to_baz tests passing!
// Execute the command `rustlings hint if2` if you want a hint :)
-// I AM NOT DONE
+// DONE
pub fn fizz_if_foo(fizzish: &str) -> &str {
if fizzish == "fizz" {
"foo"
+ } else if fizzish == "fuzz" {
+ "bar"
} else {
- 1
- }
+ "baz"
+ }
}
// No test changes needed!
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
index e2f5876..76d2353 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -1,12 +1,13 @@
// move_semantics1.rs
// Make me compile! Execute `rustlings hint move_semantics1` for hints :)
-// I AM NOT DONE
+// DONE
fn main() {
let vec0 = Vec::new();
- let vec1 = fill_vec(vec0);
+ //solution: add mut to vec1 variable
+ let mut vec1 = fill_vec(vec0);
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..8ebf52d 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -7,10 +7,18 @@
// more than 40 at once, each apple only costs 1! Write a function that calculates
// the price of an order of apples given the order amount. No hints this time!
-// I AM NOT DONE
+// DONE
// Put your function here!
// fn ..... {
+fn calculate_apple_price(x: i32) -> i32 {
+ let num = x;
+ if num > 40 {
+ x * 1
+ } else {
+ x * 2
+ }
+}
// Don't modify this function!
#[test]
diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs
index de0dce9..2609192 100644
--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@@ -17,14 +17,14 @@ fn string(arg: String) {
}
fn main() {
- ???("blue");
- ???("red".to_string());
- ???(String::from("hi"));
- ???("rust is fun!".to_owned());
- ???("nice weather".into());
- ???(format!("Interpolation {}", "Station"));
- ???(&String::from("abc")[0..1]);
- ???(" hello there ".trim());
- ???("Happy Monday!".to_string().replace("Mon", "Tues"));
- ???("mY sHiFt KeY iS sTiCkY".to_lowercase());
+ string_slice("blue");
+ string("red".to_string());
+ string(String::from("hi"));
+ string("rust is fun!".to_owned());
+ string_slice("nice weather".into());
+ string(format!("Interpolation {}", "Station"));
+ string(String::from("abc")[0..1].to_string());
+ string_slice(" hello there ".trim());
+ string("Happy Monday!".to_string().replace("Mon", "Tues"));
+ string("mY sHiFt KeY iS sTiCkY".to_lowercase());
}