From cda45ceec106439f7fb114f9e5da207cfcf96a38 Mon Sep 17 00:00:00 2001
From: Carson Rajcan <carajcan@gmail.com>
Date: Fri, 8 Jan 2021 12:50:13 -0600
Subject: [PATCH] Finish first section
---
exercises/functions/functions1.rs | 3 +-
exercises/functions/functions2.rs | 4 +-
exercises/functions/functions3.rs | 4 +-
exercises/functions/functions4.rs | 4 +-
exercises/functions/functions5.rs | 4 +-
exercises/if/if1.rs | 8 +++-
exercises/if/if2.rs | 6 +--
exercises/move_semantics/move_semantics1.rs | 2 +-
exercises/move_semantics/move_semantics2.rs | 46 ++++++++++++++++++++-
exercises/move_semantics/move_semantics3.rs | 4 +-
exercises/move_semantics/move_semantics4.rs | 8 +---
exercises/quiz1.rs | 10 +++--
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 +-
18 files changed, 76 insertions(+), 51 deletions(-)
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..2358aa0 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,7 +1,8 @@
// functions1.rs
// Make me compile! Execute `rustlings hint functions1` for hints :)
-// I AM NOT DONE
+fn call_me() {
+}
fn main() {
call_me();
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 5721a17..cfc3cc1 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: 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..e6989fa 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -1,10 +1,8 @@
// functions3.rs
// Make me compile! Execute `rustlings hint functions3` for hints :)
-// I AM NOT DONE
-
fn main() {
- call_me();
+ call_me(4);
}
fn call_me(num: i32) {
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/if/if1.rs b/exercises/if/if1.rs
index 9086754..1086463 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,13 +1,17 @@
// if1.rs
-// 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
// Execute `rustlings hint if1` for hints
+
+ 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 80effbd..b959770 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 the command `rustlings hint if2` if you want a hint :)
-// I AM NOT DONE
-
pub fn fizz_if_foo(fizzish: &str) -> &str {
if fizzish == "fizz" {
"foo"
+ } else if fizzish == "fuzz"{
+ "bar"
} else {
- 1
+ "baz"
}
}
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
index e2f5876..007a9f3 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -6,7 +6,7 @@
fn main() {
let vec0 = Vec::new();
- let vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(vec0);
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
index bd21fbb..3a73246 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,12 +2,53 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
+fn main() {
+ let mut vec0 = Vec::new();
+
+ fill_vec(&mut vec0);
+
+ // Do not change the following line!
+ println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
+
+ vec0.push(88);
+
+ println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
+}
+
+fn fill_vec(vec: &mut Vec<i32>) {
+ vec.push(22);
+ vec.push(44);
+ vec.push(66);
+}
+
+/*
+fn main() {
+ let vec0 = Vec::new();
+
+ let mut vec1 = fill_vec(&vec0);
+
+ // Do not change the following line!
+ println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
+
+ vec1.push(88);
+
+ println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
+}
+
+fn fill_vec(vec: &Vec<i32>) -> Vec<i32> {
+ let mut vec = vec.clone();
+
+ vec.push(22);
+ vec.push(44);
+ vec.push(66);
+
+ vec
+}
fn main() {
let vec0 = Vec::new();
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(vec0.clone());
// Do not change the following line!
println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
@@ -26,3 +67,4 @@ fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
vec
}
+*/
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
index 43fef74..8be23e5 100644
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -3,8 +3,6 @@
// (no lines with multiple semicolons necessary!)
// Execute `rustlings hint move_semantics3` for hints :)
-// I AM NOT DONE
-
fn main() {
let vec0 = Vec::new();
@@ -17,7 +15,7 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
vec.push(22);
vec.push(44);
vec.push(66);
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs
index a1c4a41..e827327 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,12 +4,8 @@
// freshly created vector from fill_vec to its caller.
// Execute `rustlings hint move_semantics4` for hints!
-// I AM NOT DONE
-
fn main() {
- let vec0 = Vec::new();
-
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec();
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
@@ -20,7 +16,7 @@ fn main() {
// `fill_vec()` no longer take `vec: Vec<i32>` as argument
fn fill_vec() -> Vec<i32> {
- let mut vec = vec;
+ let mut vec = vec![];
vec.push(22);
vec.push(44);
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..a627c23 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -7,10 +7,14 @@
// 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
-
// Put your function here!
-// fn ..... {
+fn calculate_apple_price(apples: u32) -> u32 {
+ if apples > 40 {
+ apples
+ } else {
+ apples * 2
+ }
+}
// 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..81e78d5 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:i32 = 10;
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..4316683 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 = 3;
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..2ad47aa 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: i32 = 3;
fn main() {
println!("Number {}", NUMBER);
}