From cd74afcb3c25f8c626ab506e6cc67ef8e753e3e3 Mon Sep 17 00:00:00 2001
From: Aymeric Larvet <aymeric.larvet@gmail.com>
Date: Tue, 13 Apr 2021 18:43:18 +0200
Subject: [PATCH] work in progress
---
exercises/functions/functions1.rs | 5 ++++-
exercises/functions/functions2.rs | 3 +--
exercises/functions/functions3.rs | 3 +--
exercises/functions/functions4.rs | 4 ++--
exercises/functions/functions5.rs | 3 +--
exercises/if/if1.rs | 8 ++++++--
exercises/if/if2.rs | 5 +++--
exercises/move_semantics/move_semantics1.rs | 3 +--
exercises/move_semantics/move_semantics2.rs | 4 +---
exercises/move_semantics/move_semantics3.rs | 4 +---
exercises/move_semantics/move_semantics4.rs | 13 +++++--------
exercises/primitive_types/primitive_types1.rs | 4 +---
exercises/primitive_types/primitive_types2.rs | 6 +-----
exercises/primitive_types/primitive_types3.rs | 4 +---
exercises/primitive_types/primitive_types4.rs | 3 +--
exercises/primitive_types/primitive_types5.rs | 3 +--
exercises/primitive_types/primitive_types6.rs | 3 +--
exercises/quiz1.rs | 9 +++++++--
exercises/structs/structs1.rs | 18 ++++++++----------
exercises/structs/structs2.rs | 6 +++---
exercises/structs/structs3.rs | 13 ++++++-------
exercises/variables/variables1.rs | 3 +--
exercises/variables/variables2.rs | 3 +--
exercises/variables/variables3.rs | 3 +--
exercises/variables/variables4.rs | 3 +--
exercises/variables/variables5.rs | 8 ++++----
exercises/variables/variables6.rs | 3 +--
27 files changed, 65 insertions(+), 82 deletions(-)
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..41422c0 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!("Hello")
+}
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 5721a17..eea5002 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,12 @@
// 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 ed5f839..5f87195 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(12);
}
fn call_me(num: u32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 58637e4..21e2a14 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -4,14 +4,14 @@
// 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..ee79e79 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
}
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 9086754..868f5ca 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..4d1ab2d 100644
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -4,13 +4,14 @@
// 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..78e4f8a 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -1,12 +1,11 @@
// move_semantics1.rs
// Make me compile! Execute `rustlings hint move_semantics1` for hints :)
-// I AM NOT DONE
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..5579062 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,12 +2,10 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
-
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);
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 2a23c71..d8cd899 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,23 +4,20 @@
// 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 vec0 = fill_vec();
- println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
+ println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
- vec1.push(88);
+ vec0.push(88);
- println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
+ println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
}
// `fill_vec()` no longer takes `vec: Vec<i32>` as argument
fn fill_vec() -> Vec<i32> {
- let mut vec = vec;
+ let mut vec = Vec::new();
vec.push(22);
vec.push(44);
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..f0ab8ac 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@@ -2,8 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
-
fn main() {
// Booleans (`bool`)
@@ -12,7 +10,7 @@ fn main() {
println!("Good morning!");
}
- let // Finish the rest of this line like the example! Or make it be false!
+ let is_evening = true;
if is_evening {
println!("Good evening!");
}
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
index 6576a4d..6f847cb 100644
--- a/exercises/primitive_types/primitive_types2.rs
+++ b/exercises/primitive_types/primitive_types2.rs
@@ -2,8 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
-
fn main() {
// Characters (`char`)
@@ -16,9 +14,7 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
- // Try a letter, try a number, try a special character, try a character
- // from a different language than your own, try an emoji!
+ let your_character = '@';
if your_character.is_alphabetic() {
println!("Alphabetical!");
} else if your_character.is_numeric() {
diff --git a/exercises/primitive_types/primitive_types3.rs b/exercises/primitive_types/primitive_types3.rs
index aaa518b..ca263cb 100644
--- a/exercises/primitive_types/primitive_types3.rs
+++ b/exercises/primitive_types/primitive_types3.rs
@@ -2,10 +2,8 @@
// Create an array with at least 100 elements in it where the ??? is.
// Execute `rustlings hint primitive_types3` for hints!
-// I AM NOT DONE
-
fn main() {
- let a = ???
+ let a:[i32; 111] = [0;111];
if a.len() >= 100 {
println!("Wow, that's a big array!");
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
index 10b553e..0d939ab 100644
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@@ -2,13 +2,12 @@
// Get a slice out of Array a where the ??? is so that the test passes.
// Execute `rustlings hint primitive_types4` for hints!!
-// I AM NOT DONE
#[test]
fn slice_out_of_array() {
let a = [1, 2, 3, 4, 5];
- let nice_slice = ???
+ let nice_slice = & a[1 .. 4];
assert_eq!([2, 3, 4], nice_slice)
}
diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/primitive_types/primitive_types5.rs
index 680d8d2..dc57315 100644
--- a/exercises/primitive_types/primitive_types5.rs
+++ b/exercises/primitive_types/primitive_types5.rs
@@ -2,11 +2,10 @@
// Destructure the `cat` tuple so that the println will work.
// Execute `rustlings hint primitive_types5` for hints!
-// I AM NOT DONE
fn main() {
let cat = ("Furry McFurson", 3.5);
- let /* your pattern here */ = cat;
+ let (name, age) = cat;
println!("{} is {} years old.", name, age);
}
diff --git a/exercises/primitive_types/primitive_types6.rs b/exercises/primitive_types/primitive_types6.rs
index b8c9b82..86b5269 100644
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@@ -3,13 +3,12 @@
// You can put the expression for the second element where ??? is so that the test passes.
// Execute `rustlings hint primitive_types6` for hints!
-// I AM NOT DONE
#[test]
fn indexing_tuple() {
let numbers = (1, 2, 3);
// Replace below ??? with the tuple indexing syntax.
- let second = ???;
+ let second = numbers.1;
assert_eq!(2, second,
"This is not the 2nd number in the tuple!")
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..7066aa2 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -7,10 +7,15 @@
// 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(nb_apple:i32) -> i32 {
+ if nb_apple <= 40 {
+ nb_apple * 2
+ } else {
+ nb_apple * 1
+ }
+}
// Don't modify this function!
#[test]
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..a4111aa 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,13 +1,12 @@
// structs1.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
-
struct ColorClassicStruct {
- // TODO: Something goes here
+ name: String,
+ hex: String,
}
-struct ColorTupleStruct(/* TODO: Something goes here */);
+struct ColorTupleStruct(String, String);
#[derive(Debug)]
struct UnitStruct;
@@ -18,8 +17,9 @@ mod tests {
#[test]
fn classic_c_structs() {
- // TODO: Instantiate a classic c struct!
- // let green =
+ let name = "green".to_string();
+ let hex = "#00FF00".to_string();
+ let green = ColorClassicStruct { name: name, hex: hex };
assert_eq!(green.name, "green");
assert_eq!(green.hex, "#00FF00");
@@ -27,8 +27,7 @@ mod tests {
#[test]
fn tuple_structs() {
- // TODO: Instantiate a tuple struct!
- // let green =
+ let green = ColorTupleStruct ("green".to_string(), "#00FF00".to_string());
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
@@ -36,8 +35,7 @@ mod tests {
#[test]
fn unit_structs() {
- // TODO: Instantiate a unit struct!
- // let unit_struct =
+ let unit_struct = UnitStruct;
let message = format!("{:?}s are fun!", unit_struct);
assert_eq!(message, "UnitStructs are fun!");
diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs
index f9c6427..a7a3f18 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -1,8 +1,6 @@
// structs2.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
-
#[derive(Debug)]
struct Order {
name: String,
@@ -34,7 +32,9 @@ mod tests {
fn your_order() {
let order_template = create_order_template();
// TODO: Create your own order using the update syntax and template above!
- // let your_order =
+ let mut your_order = create_order_template();
+ your_order.name = String::from("Hacker in Rust");
+ your_order.count = 1;
assert_eq!(your_order.name, "Hacker in Rust");
assert_eq!(your_order.year, order_template.year);
assert_eq!(your_order.made_by_phone, order_template.made_by_phone);
diff --git a/exercises/structs/structs3.rs b/exercises/structs/structs3.rs
index 8d8b471..849681b 100644
--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@@ -4,7 +4,6 @@
// Make the code compile and the tests pass!
// If you have issues execute `rustlings hint structs3`
-// I AM NOT DONE
#[derive(Debug)]
struct Package {
@@ -16,7 +15,7 @@ struct Package {
impl Package {
fn new(sender_country: String, recipient_country: String, weight_in_grams: i32) -> Package {
if weight_in_grams <= 0 {
- // Something goes here...
+ panic!("Error weightless package")
} else {
return Package {
sender_country,
@@ -26,12 +25,12 @@ impl Package {
}
}
- fn is_international(&self) -> ??? {
- // Something goes here...
+ fn is_international(&self) -> bool {
+ return self.sender_country != self.recipient_country;
}
- fn get_fees(&self, cents_per_gram: i32) -> ??? {
- // Something goes here...
+ fn get_fees(&self, cents_per_gram: i32) -> i32 {
+ return self.weight_in_grams * cents_per_gram;
}
}
@@ -73,7 +72,7 @@ mod tests {
let sender_country = String::from("Spain");
let recipient_country = String::from("Spain");
- let cents_per_gram = ???;
+ let cents_per_gram = 3;
let package = Package::new(sender_country, recipient_country, 1500);
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 4a3af73..149d5ce 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -6,9 +6,8 @@
// 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..33ba85d 100644
--- a/exercises/variables/variables2.rs
+++ b/exercises/variables/variables2.rs
@@ -1,10 +1,9 @@
// 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:u32 = 0;
if x == 10 {
println!("Ten!");
} else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 30ec48f..59d8983 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -1,10 +1,9 @@
// 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:u32 = 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..c64e807 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -1,9 +1,8 @@
// 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 = 5;
println!("Number {}", x);
}
diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs
index da37ae9..4d409b1 100644
--- a/exercises/variables/variables5.rs
+++ b/exercises/variables/variables5.rs
@@ -1,11 +1,11 @@
// 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";
+ let mut number = "T-H-R-E-E";
println!("Spell a Number : {}", number);
- number = 3;
- println!("Number plus two is : {}", number + 2);
+ number = "3";
+ println!("Number plus two is : {}", number.parse::<i32>().unwrap() + 2);
}
diff --git a/exercises/variables/variables6.rs b/exercises/variables/variables6.rs
index 9866691..ebd911d 100644
--- a/exercises/variables/variables6.rs
+++ b/exercises/variables/variables6.rs
@@ -1,9 +1,8 @@
// 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);
}